This commit was manufactured by cvs2svn to create tag 'v20080311'.
diff --git a/assembly/plugins/org.eclipse.jsf.branding/.classpath b/assembly/plugins/org.eclipse.jsf.branding/.classpath
deleted file mode 100644
index 7cec603..0000000
--- a/assembly/plugins/org.eclipse.jsf.branding/.classpath
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/assembly/plugins/org.eclipse.jsf.branding/.cvsignore b/assembly/plugins/org.eclipse.jsf.branding/.cvsignore
deleted file mode 100644
index 7033a79..0000000
--- a/assembly/plugins/org.eclipse.jsf.branding/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-@dot*
-temp.folder
-build.xml
diff --git a/assembly/plugins/org.eclipse.jsf.branding/.project b/assembly/plugins/org.eclipse.jsf.branding/.project
deleted file mode 100644
index bd50004..0000000
--- a/assembly/plugins/org.eclipse.jsf.branding/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jsf.branding</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/assembly/plugins/org.eclipse.jsf.branding/META-INF/MANIFEST.MF b/assembly/plugins/org.eclipse.jsf.branding/META-INF/MANIFEST.MF
deleted file mode 100644
index 8524822..0000000
--- a/assembly/plugins/org.eclipse.jsf.branding/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %plugin.Name
-Bundle-SymbolicName: org.eclipse.jsf
-Bundle-Version: 1.0.1.qualifier
-Bundle-Localization: plugin
-Bundle-Vendor: %plugin.Provider
diff --git a/assembly/plugins/org.eclipse.jsf.branding/about.html b/assembly/plugins/org.eclipse.jsf.branding/about.html
deleted file mode 100644
index 7c80c6c..0000000
--- a/assembly/plugins/org.eclipse.jsf.branding/about.html
+++ /dev/null
@@ -1,22 +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">
-<h2>About This Content</h2>
-
-<p>June 06, 2007</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/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</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.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/assembly/plugins/org.eclipse.jsf.branding/about.ini b/assembly/plugins/org.eclipse.jsf.branding/about.ini
deleted file mode 100644
index a21a3ec..0000000
--- a/assembly/plugins/org.eclipse.jsf.branding/about.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=eclipse32.gif
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-
-
diff --git a/assembly/plugins/org.eclipse.jsf.branding/about.mappings b/assembly/plugins/org.eclipse.jsf.branding/about.mappings
deleted file mode 100644
index bddaab4..0000000
--- a/assembly/plugins/org.eclipse.jsf.branding/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
\ No newline at end of file
diff --git a/assembly/plugins/org.eclipse.jsf.branding/about.properties b/assembly/plugins/org.eclipse.jsf.branding/about.properties
deleted file mode 100644
index c62b076..0000000
--- a/assembly/plugins/org.eclipse.jsf.branding/about.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 Oracle 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:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-
-blurb=JavaServer Faces Tools\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2005. All rights reserved.\n\
-Visit http://www.eclipse.org/webtools
diff --git a/assembly/plugins/org.eclipse.jsf.branding/build.properties b/assembly/plugins/org.eclipse.jsf.branding/build.properties
deleted file mode 100644
index ab20e78..0000000
--- a/assembly/plugins/org.eclipse.jsf.branding/build.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2006 Oracle 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:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-bin.includes = META-INF/,\
- eclipse32.png,\
- eclipse32.gif,\
- about.properties,\
- about.mappings,\
- about.ini,\
- about.html,\
- plugin.properties,\
- component.xml
-
diff --git a/assembly/plugins/org.eclipse.jsf.branding/component.xml b/assembly/plugins/org.eclipse.jsf.branding/component.xml
deleted file mode 100644
index d470a56..0000000
--- a/assembly/plugins/org.eclipse.jsf.branding/component.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component xmlns="http://eclipse.org/wtp/releng/tools/component-model" name="org.eclipse.jsf">
-<description url=""></description>
-<component-depends unrestricted="true"></component-depends>
-<plugin id="org.eclipse.jst.jsf.common" fragment="false"/>
-<plugin id="org.eclipse.jst.jsf.common.ui" fragment="false"/>
-<plugin id="org.eclipse.jst.jsf.core" fragment="false"/>
-<plugin id="org.eclipse.jst.jsf.ui" fragment="false"/>
-<plugin id="org.eclipse.jst.jsf.standard.tagsupport" fragment="false"/>
-<plugin id="org.eclipse.jst.jsf.facesconfig" fragment="false"/>
-<plugin id="org.eclipse.jst.jsf.facesconfig.ui" fragment="false"/>
-<plugin id="org.eclipse.jst.pagedesigner" fragment="false"/>
-<plugin id="org.eclipse.jst.pagedesigner.jsf.ui" fragment="false"/>
-<plugin id="org.eclipse.jst.pagedesigner.jsp.core" fragment="false"/>
-<plugin id="org.eclipse.jst.jsf.doc.dev" fragment="false"/>
-</component>
-
-
-
-
-
-
-
diff --git a/assembly/plugins/org.eclipse.jsf.branding/eclipse32.gif b/assembly/plugins/org.eclipse.jsf.branding/eclipse32.gif
deleted file mode 100644
index e6ad7cc..0000000
--- a/assembly/plugins/org.eclipse.jsf.branding/eclipse32.gif
+++ /dev/null
Binary files differ
diff --git a/assembly/plugins/org.eclipse.jsf.branding/eclipse32.png b/assembly/plugins/org.eclipse.jsf.branding/eclipse32.png
deleted file mode 100644
index 568fac1..0000000
--- a/assembly/plugins/org.eclipse.jsf.branding/eclipse32.png
+++ /dev/null
Binary files differ
diff --git a/assembly/plugins/org.eclipse.jsf.branding/plugin.properties b/assembly/plugins/org.eclipse.jsf.branding/plugin.properties
deleted file mode 100644
index 2b7a864..0000000
--- a/assembly/plugins/org.eclipse.jsf.branding/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 Oracle 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
-###############################################################################
-
-plugin.Name=JavaServer Faces Tools
-plugin.Provider=Eclipse.org
\ No newline at end of file
diff --git a/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature/.cvsignore b/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature/.cvsignore
deleted file mode 100644
index c14487c..0000000
--- a/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature/.project b/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature/.project
deleted file mode 100644
index a1d8502..0000000
--- a/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature/build.properties b/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature/build.properties
deleted file mode 100644
index cb50260..0000000
--- a/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
- license.html,\
- feature.properties,\
- epl-v10.html,\
- eclipse_update_120.jpg
diff --git a/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature/eclipse_update_120.jpg b/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature/epl-v10.html b/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature/feature.properties b/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature/feature.properties
deleted file mode 100644
index 6816439..0000000
--- a/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2007 Oracle 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:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=WTP Web Page Editor Apache MyFaces Trinidad Tag Support
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=Web Tools Platform (WTP) Web Page Editor support for Apache MyFaces Trinidad JSF component library
-
-# "copyright" property - text of the "Feature Update Copyright"
-feature.copyright=\
-Copyright (c) 2007 Oracle Corporation.\
-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\
-\n\
-Contributors:\n\
- Oracle Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-June 7, 2007\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature/feature.xml b/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature/feature.xml
deleted file mode 100644
index 8df4f52..0000000
--- a/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature/feature.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature"
- label="%featureName"
- version="2.0.0.qualifier"
- provider-name="%providerName">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="license.html">
- %license
- </license>
-
- <url>
- <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates"/>
- <discovery label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates"/>
- </url>
-
- <requires>
- <import plugin="org.eclipse.ui" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.emf.ecore.xmi" version="2.2.0" match="compatible"/>
- <import plugin="org.eclipse.gef" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.wst.sse.core" version="1.1.0" match="equivalent"/>
- <import plugin="org.eclipse.jst.jsf.common" version="1.0.0" match="equivalent"/>
- <import plugin="org.eclipse.jst.pagedesigner" version="1.0.0" match="equivalent"/>
- <import plugin="org.eclipse.jst.jsf.core" version="1.0.0" match="equivalent"/>
- </requires>
-
- <plugin
- id="org.eclipse.jst.jsf.apache.trinidad.tagsupport"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
diff --git a/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature/license.html b/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature/license.html
deleted file mode 100644
index a450af9..0000000
--- a/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature/license.html
+++ /dev/null
@@ -1,97 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse
-Foundation is provided to you under the terms and conditions of the Eclipse
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this
-Content and is also available at <A
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code,
-documentation and other files maintained in the Eclipse.org CVS repository
-("Repository") in CVS modules ("Modules") and made available as downloadable
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may
-contain a list of the names and version numbers of the Plug-ins and/or Fragments
-associated with a Feature. Plug-ins and Fragments are located in directories
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named
-"feature.xml" may contain a list of the names and version numbers of Included
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained
-in files named "about.html" ("Abouts"). The terms and conditions governing
-Features and Included Features should be contained in files named "license.html"
-("Feature Licenses"). Abouts and Feature Licenses may be located in any
-directory of a Download or Module including, but not limited to the following
-locations:</P>
-<UL>
- <LI>The top-level (root) directory
- <LI>Plug-in and Fragment directories
- <LI>Subdirectories of the directory named "src" of certain Plug-ins
- <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed
-using the Eclipse Update Manager, you must agree to a license ("Feature Update
-License") during the installation process. If the Feature contains Included
-Features, the Feature Update License should either provide you with the terms
-and conditions governing the Included Features or inform you where you can
-locate them. Feature Update Licenses may be found in the "license" property of
-files named "feature.properties". Such Abouts, Feature Licenses and Feature
-Update Licenses contain the terms and conditions (or references to such terms
-and conditions) that govern your use of the associated Content in that
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
- <LI>Common Public License Version 1.0 (available at <A
- href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>)
-
- <LI>Apache Software License 1.1 (available at <A
- href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>)
-
- <LI>Apache Software License 2.0 (available at <A
- href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>)
-
- <LI>IBM Public License 1.0 (available at <A
- href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>)
-
- <LI>Metro Link Public License 1.00 (available at <A
- href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>)
-
- <LI>Mozilla Public License Version 1.1 (available at <A
- href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>)
-
- <li>Common Development and Distribution License (CDDL) Version 1.0 (available at <A
- href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A>
- </LI>
- </LI></UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is
-provided, please contact the Eclipse Foundation to determine what terms and
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are
-currently may have restrictions on the import, possession, and use, and/or
-re-export to another country, of encryption software. BEFORE using any
-encryption software, please check the country's laws, regulations and policies
-concerning the import, possession, or use, and re-export of encryption software,
-to see if this is permitted.</P></BODY></HTML>
diff --git a/jsf/features/org.eclipse.jst.webpageeditor.feature/.cvsignore b/jsf/features/org.eclipse.jst.webpageeditor.feature/.cvsignore
deleted file mode 100644
index c14487c..0000000
--- a/jsf/features/org.eclipse.jst.webpageeditor.feature/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/jsf/features/org.eclipse.jst.webpageeditor.feature/.project b/jsf/features/org.eclipse.jst.webpageeditor.feature/.project
deleted file mode 100644
index e089155..0000000
--- a/jsf/features/org.eclipse.jst.webpageeditor.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.webpageeditor.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/jsf/features/org.eclipse.jst.webpageeditor.feature/build.properties b/jsf/features/org.eclipse.jst.webpageeditor.feature/build.properties
deleted file mode 100644
index cb50260..0000000
--- a/jsf/features/org.eclipse.jst.webpageeditor.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
- license.html,\
- feature.properties,\
- epl-v10.html,\
- eclipse_update_120.jpg
diff --git a/jsf/features/org.eclipse.jst.webpageeditor.feature/eclipse_update_120.jpg b/jsf/features/org.eclipse.jst.webpageeditor.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/jsf/features/org.eclipse.jst.webpageeditor.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/jsf/features/org.eclipse.jst.webpageeditor.feature/epl-v10.html b/jsf/features/org.eclipse.jst.webpageeditor.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/jsf/features/org.eclipse.jst.webpageeditor.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/jsf/features/org.eclipse.jst.webpageeditor.feature/feature.properties b/jsf/features/org.eclipse.jst.webpageeditor.feature/feature.properties
deleted file mode 100644
index 09211a4..0000000
--- a/jsf/features/org.eclipse.jst.webpageeditor.feature/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2007 Oracle 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:
-# Gerry Kessler - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=WTP Web Page Editor
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=Web Tools Platform (WTP) Web Page Editor
-
-# "copyright" property - text of the "Feature Update Copyright"
-feature.copyright=\
-Copyright (c) 2007 Oracle Corporation.\
-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\
-\n\
-Contributors:\n\
- Oracle Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-June 7, 2007\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/jsf/features/org.eclipse.jst.webpageeditor.feature/feature.xml b/jsf/features/org.eclipse.jst.webpageeditor.feature/feature.xml
deleted file mode 100644
index 80c0ad7..0000000
--- a/jsf/features/org.eclipse.jst.webpageeditor.feature/feature.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.webpageeditor.feature"
- label="%featureName"
- version="2.0.0.qualifier"
- provider-name="%providerName"
- image="eclipse_update_120.jpg">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="license.html">
- %license
- </license>
-
- <url>
- <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates"/>
- <discovery label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates"/>
- </url>
-
- <requires>
- <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.debug.ui" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.gef" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.jface.text" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.ui.workbench.texteditor" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.wst.sse.ui" version="1.0.101"/>
- <import plugin="org.eclipse.jst.jsp.core" version="1.1.0"/>
- <import plugin="org.eclipse.jst.jsp.ui" version="1.1.0"/>
- <import plugin="org.eclipse.ui.ide" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.jdt.ui" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.jdt.core" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.core.resources" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.emf.ecore" version="2.2.0" match="compatible"/>
- <import plugin="org.eclipse.wst.common.ui" version="1.1.0" match="compatible"/>
- <import plugin="org.eclipse.wst.common.uriresolver" version="1.1.0" match="compatible"/>
- <import plugin="org.eclipse.jst.j2ee" version="1.1.0" match="compatible"/>
- <import plugin="org.eclipse.jst.j2ee.web" version="1.1.0" match="compatible"/>
- <import plugin="org.eclipse.jst.pagedesigner.jsp.core" version="1.0.0" match="compatible"/>
- <import plugin="org.eclipse.jst.jsf.common.ui" version="1.0.0" match="compatible"/>
- <import plugin="org.eclipse.jst.jsf.common" version="1.0.0" match="compatible"/>
- <import plugin="org.eclipse.jst.jsf.core" version="1.0.0" match="compatible"/>
- <import plugin="org.eclipse.wst.html.ui" version="1.0.100" match="compatible"/>
- <import plugin="org.eclipse.wst.css.core" version="1.1.0" match="compatible"/>
- <import plugin="org.eclipse.wst.html.core" version="1.1.0" match="compatible"/>
- <import plugin="org.eclipse.wst.xml.ui" version="1.0.100" match="compatible"/>
- <import plugin="org.eclipse.wst.xml.core" version="1.1.0" match="compatible"/>
- <import plugin="org.eclipse.wst.sse.core" version="1.1.0" match="compatible"/>
- <import plugin="javax.servlet" version="2.4.0" match="compatible"/>
- <import plugin="org.apache.commons.el" version="1.0.0" match="compatible"/>
- <import plugin="javax.servlet.jsp" version="2.0.0" match="compatible"/>
- <import plugin="org.eclipse.ui.views.properties.tabbed" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.jst.jsf.facesconfig" version="1.0.0" match="compatible"/>
- <import plugin="org.eclipse.jst.pagedesigner" version="1.0.0" match="compatible"/>
- <import plugin="org.eclipse.wst.common.modulecore" version="1.1.0" match="compatible"/>
- </requires>
-
- <plugin
- id="org.eclipse.jst.pagedesigner"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.pagedesigner.jsf.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.pagedesigner.jsp.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
diff --git a/jsf/features/org.eclipse.jst.webpageeditor.feature/license.html b/jsf/features/org.eclipse.jst.webpageeditor.feature/license.html
deleted file mode 100644
index a450af9..0000000
--- a/jsf/features/org.eclipse.jst.webpageeditor.feature/license.html
+++ /dev/null
@@ -1,97 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse
-Foundation is provided to you under the terms and conditions of the Eclipse
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this
-Content and is also available at <A
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code,
-documentation and other files maintained in the Eclipse.org CVS repository
-("Repository") in CVS modules ("Modules") and made available as downloadable
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may
-contain a list of the names and version numbers of the Plug-ins and/or Fragments
-associated with a Feature. Plug-ins and Fragments are located in directories
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named
-"feature.xml" may contain a list of the names and version numbers of Included
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained
-in files named "about.html" ("Abouts"). The terms and conditions governing
-Features and Included Features should be contained in files named "license.html"
-("Feature Licenses"). Abouts and Feature Licenses may be located in any
-directory of a Download or Module including, but not limited to the following
-locations:</P>
-<UL>
- <LI>The top-level (root) directory
- <LI>Plug-in and Fragment directories
- <LI>Subdirectories of the directory named "src" of certain Plug-ins
- <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed
-using the Eclipse Update Manager, you must agree to a license ("Feature Update
-License") during the installation process. If the Feature contains Included
-Features, the Feature Update License should either provide you with the terms
-and conditions governing the Included Features or inform you where you can
-locate them. Feature Update Licenses may be found in the "license" property of
-files named "feature.properties". Such Abouts, Feature Licenses and Feature
-Update Licenses contain the terms and conditions (or references to such terms
-and conditions) that govern your use of the associated Content in that
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
- <LI>Common Public License Version 1.0 (available at <A
- href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>)
-
- <LI>Apache Software License 1.1 (available at <A
- href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>)
-
- <LI>Apache Software License 2.0 (available at <A
- href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>)
-
- <LI>IBM Public License 1.0 (available at <A
- href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>)
-
- <LI>Metro Link Public License 1.00 (available at <A
- href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>)
-
- <LI>Mozilla Public License Version 1.1 (available at <A
- href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>)
-
- <li>Common Development and Distribution License (CDDL) Version 1.0 (available at <A
- href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A>
- </LI>
- </LI></UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is
-provided, please contact the Eclipse Foundation to determine what terms and
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are
-currently may have restrictions on the import, possession, and use, and/or
-re-export to another country, of encryption software. BEFORE using any
-encryption software, please check the country's laws, regulations and policies
-concerning the import, possession, or use, and re-export of encryption software,
-to see if this is permitted.</P></BODY></HTML>
diff --git a/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplateFeature/build.properties b/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplateFeature/build.properties
deleted file mode 100644
index 657ba1b..0000000
--- a/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplateFeature/build.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2007 Oracle 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:
-# Gerry Kessler - initial API and implementation
-###############################################################################
-# This file should be NOT be translated.
-bin.includes =\
-epl-v10.html,\
-eclipse_update_120.jpg,\
-feature.xml,\
-feature.properties,\
-license.html
-
-
diff --git a/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplateFeature/eclipse_update_120.jpg b/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplateFeature/epl-v10.html b/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 022ad29..0000000
--- a/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
diff --git a/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplateFeature/feature.properties b/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index bea5ceb..0000000
--- a/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,147 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2007 Oracle 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:
-# Gerry Kessler - initial API and implementation
-###############################################################################
-# This file should be translated.
-# feature.properties
-# contains externalized strings for feature.xml
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-#
-# "featureName" property - name of the feature
-featureName=Web Page Editor Source
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=Source code zips for Web Page Editor.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-2007 Oracle 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\
-\n\
-Contributors:\n\
- Oracle Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-June 06, 2007\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
- - Common Development and Distribution License (CDDL) Version 1.0 (available at http://www.sun.com/cddl/cddl.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplateFeature/license.html b/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplateFeature/license.html
deleted file mode 100644
index fec4a48..0000000
--- a/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>June 06, 2007</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
- CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
- OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
- NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
- CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
- ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
- For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS
- modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>
- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
- <LI>Common Development and Distribution License (CDDL) Version 1.0 (available at <A
- href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A>
- </LI>
-</UL>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
- another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
- possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>
-</body>
-</html>
diff --git a/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/about.html b/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index d4916df..0000000
--- a/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/about.html
+++ /dev/null
@@ -1,27 +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">
-<h2>About This Content</h2>
-
-<p>June 06, 2007</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/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</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.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files ("Source Zips") that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in "about.html" files ("Abouts") located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
diff --git a/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/about.ini b/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index 2dee36a..0000000
--- a/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/about.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=eclipse32.gif
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-
-
-
-
diff --git a/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/about.mappings b/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index a28390a..0000000
--- a/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
diff --git a/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/about.properties b/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index e3cbbc3..0000000
--- a/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2007 Oracle 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:
-# Gerry Kessler - initial API and implementation
-###############################################################################
-# This file should be translated.
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=Web Page Editor Source\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2007. All rights reserved.\n\
-Visit http://www.eclipse.org/webtools
-
diff --git a/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/build.properties b/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index 5895597..0000000
--- a/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-
-bin.includes = about.html, about.ini, about.mappings, about.properties, eclipse32.gif, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/eclipse32.gif b/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/eclipse32.gif
deleted file mode 100644
index e6ad7cc..0000000
--- a/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/eclipse32.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/eclipse32.png b/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/eclipse32.png
deleted file mode 100644
index 50ae49d..0000000
--- a/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/eclipse32.png
+++ /dev/null
Binary files differ
diff --git a/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/plugin.properties b/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index 46b3449..0000000
--- a/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2007 Oracle 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:
-# Gerry Kessler - initial API and implementation
-###############################################################################
-# This file should be translated.
-# plugin.properties
-# contains externalized strings for manifest.mf
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-pluginName=Web Page Editor Source
-providerName=Eclipse.org
diff --git a/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/.cvsignore b/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/.cvsignore
deleted file mode 100644
index c14487c..0000000
--- a/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/.project b/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/.project
deleted file mode 100644
index 1e4ee00..0000000
--- a/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.webpageeditor_sdk.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/build.properties b/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/build.properties
deleted file mode 100644
index 52970fa..0000000
--- a/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-bin.includes = feature.xml,\
- license.html,\
- feature.properties,\
- epl-v10.html,\
- eclipse_update_120.jpg
-
-generate.feature@org.eclipse.jst.webpageeditor.feature.source = org.eclipse.jst.webpageeditor.feature
-
\ No newline at end of file
diff --git a/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/eclipse_update_120.jpg b/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/epl-v10.html b/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/feature.properties b/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/feature.properties
deleted file mode 100644
index 8fb7e29..0000000
--- a/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2007 Oracle 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:
-# Gerry Kessler - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=WTP Web Page Editor SDK
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=Web Tools Platform (WTP) Web Page Editor SDK
-
-# "copyright" property - text of the "Feature Update Copyright"
-feature.copyright=\
-Copyright (c) 2007 Oracle Corporation.\
-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\
-\n\
-Contributors:\n\
- Oracle Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-June 7, 2007\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/feature.xml b/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/feature.xml
deleted file mode 100644
index 6760a8f..0000000
--- a/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/feature.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.webpageeditor_sdk.feature"
- label="SDK for WebPageEditor"
- version="2.0.0.qualifier"
- provider-name="Eclipse.org">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="license.html">
- %license
- </license>
-
- <url>
- <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates"/>
- <discovery label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates"/>
- </url>
-
- <includes
- id="org.eclipse.jst.webpageeditor.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jst.webpageeditor.feature.source"
- version="0.0.0"/>
-
-</feature>
diff --git a/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/license.html b/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/license.html
deleted file mode 100644
index a450af9..0000000
--- a/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/license.html
+++ /dev/null
@@ -1,97 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse
-Foundation is provided to you under the terms and conditions of the Eclipse
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this
-Content and is also available at <A
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code,
-documentation and other files maintained in the Eclipse.org CVS repository
-("Repository") in CVS modules ("Modules") and made available as downloadable
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may
-contain a list of the names and version numbers of the Plug-ins and/or Fragments
-associated with a Feature. Plug-ins and Fragments are located in directories
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named
-"feature.xml" may contain a list of the names and version numbers of Included
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained
-in files named "about.html" ("Abouts"). The terms and conditions governing
-Features and Included Features should be contained in files named "license.html"
-("Feature Licenses"). Abouts and Feature Licenses may be located in any
-directory of a Download or Module including, but not limited to the following
-locations:</P>
-<UL>
- <LI>The top-level (root) directory
- <LI>Plug-in and Fragment directories
- <LI>Subdirectories of the directory named "src" of certain Plug-ins
- <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed
-using the Eclipse Update Manager, you must agree to a license ("Feature Update
-License") during the installation process. If the Feature contains Included
-Features, the Feature Update License should either provide you with the terms
-and conditions governing the Included Features or inform you where you can
-locate them. Feature Update Licenses may be found in the "license" property of
-files named "feature.properties". Such Abouts, Feature Licenses and Feature
-Update Licenses contain the terms and conditions (or references to such terms
-and conditions) that govern your use of the associated Content in that
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
- <LI>Common Public License Version 1.0 (available at <A
- href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>)
-
- <LI>Apache Software License 1.1 (available at <A
- href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>)
-
- <LI>Apache Software License 2.0 (available at <A
- href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>)
-
- <LI>IBM Public License 1.0 (available at <A
- href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>)
-
- <LI>Metro Link Public License 1.00 (available at <A
- href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>)
-
- <LI>Mozilla Public License Version 1.1 (available at <A
- href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>)
-
- <li>Common Development and Distribution License (CDDL) Version 1.0 (available at <A
- href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A>
- </LI>
- </LI></UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is
-provided, please contact the Eclipse Foundation to determine what terms and
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are
-currently may have restrictions on the import, possession, and use, and/or
-re-export to another country, of encryption software. BEFORE using any
-encryption software, please check the country's laws, regulations and policies
-concerning the import, possession, or use, and re-export of encryption software,
-to see if this is permitted.</P></BODY></HTML>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/.classpath b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/.classpath
deleted file mode 100644
index ce73933..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <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"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/.cvsignore b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/.cvsignore
deleted file mode 100644
index a179f16..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-@dot
-build.xml
-javaCompiler...args
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/.project b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/.project
deleted file mode 100644
index 4fe172b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.jsf.common.runtime</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/jsf/plugins/org.eclipse.jst.jsf.common.runtime/.settings/org.eclipse.jdt.core.prefs b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 4f79f7b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,79 +0,0 @@
-#Wed Jan 09 14:34:02 PST 2008
-eclipse.preferences.version=1
-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.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=error
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-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=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-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=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=error
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-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
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/META-INF/MANIFEST.MF b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/META-INF/MANIFEST.MF
deleted file mode 100644
index 416d6eb..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: CommonComponentPlugin Plug-in
-Bundle-SymbolicName: org.eclipse.jst.jsf.common.runtime
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.jst.jsf.common.runtime.internal.JSFCommonRuntimePlugin
-Require-Bundle: org.eclipse.core.runtime
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Export-Package: org.eclipse.jst.jsf.common.runtime.internal.debug,
- org.eclipse.jst.jsf.common.runtime.internal.model,
- org.eclipse.jst.jsf.common.runtime.internal.model.bean,
- org.eclipse.jst.jsf.common.runtime.internal.model.behavioural,
- org.eclipse.jst.jsf.common.runtime.internal.model.component,
- org.eclipse.jst.jsf.common.runtime.internal.model.datatypes,
- org.eclipse.jst.jsf.common.runtime.internal.model.decorator,
- org.eclipse.jst.jsf.common.runtime.internal.model.event,
- org.eclipse.jst.jsf.common.runtime.internal.model.types,
- org.eclipse.jst.jsf.common.runtime.internal.view.model.common
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/build.properties b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/build.properties
deleted file mode 100644
index 34d2e4d..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/instrumentation/WebContent/WEB-INF/faces-config.xml b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/instrumentation/WebContent/WEB-INF/faces-config.xml
deleted file mode 100644
index 15eef3b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/instrumentation/WebContent/WEB-INF/faces-config.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE faces-config PUBLIC
- "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
- "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
-
-<faces-config>
- <lifecycle>
- <phase-listener>
- instrument.PhaseListener1</phase-listener>
- </lifecycle>
-</faces-config>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/instrumentation/jar/jsfrt.jar b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/instrumentation/jar/jsfrt.jar
deleted file mode 100644
index 5093673..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/instrumentation/jar/jsfrt.jar
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/instrumentation/src/instrument/MyMonitorMessageFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/instrumentation/src/instrument/MyMonitorMessageFactory.java
deleted file mode 100644
index f03216b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/instrumentation/src/instrument/MyMonitorMessageFactory.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package instrument;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.util.Iterator;
-
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIInput;
-import javax.faces.component.UIOutput;
-
-import org.eclipse.jst.jsf.common.runtime.internal.debug.JSFMonitorMessage;
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.ComponentFactory;
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.ComponentInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.FacetInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.UIInputInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.UIOutputInfo;
-
-public class MyMonitorMessageFactory
-{
- public static JSFMonitorMessage createJSFMonitorMessage(InputStream inStream) throws IOException, ClassCastException, ClassNotFoundException
- {
- ObjectInputStream objectStream = new ObjectInputStream(inStream);
- Object nextObject = objectStream.readObject();
- return (JSFMonitorMessage) nextObject;
- }
-
- static ComponentInfo buildComponentTree(UIComponent component, boolean isFacet)
- {
- final ComponentInfo componentInfo = getComponentData(component, isFacet);
-
- for (Iterator it = component.getChildren().iterator(); it.hasNext();)
- {
- UIComponent child = (UIComponent) it.next();
- componentInfo.getChildren().add(buildComponentTree(child, false));
- }
-
- for (Iterator it = component.getFacets().values().iterator(); it.hasNext();)
- {
- UIComponent facet = (UIComponent) it.next();
- componentInfo.getChildren().add(buildComponentTree(facet, true));
- }
-
- return componentInfo;
- }
-
- private static ComponentInfo getComponentData(final UIComponent component, boolean isFacet)
- {
- if (isFacet)
- {
- return calculateFacetInfo(component);
- }
- else if (component instanceof UIInput)
- {
- return calculateUIInput((UIInput)component);
- }
- else if (component instanceof UIOutput)
- {
- return calculateUIOutput((UIOutput)component);
- }
-
- // default; just make a component
- return calculateComponentInfo(component);
- }
-
- private static ComponentInfo calculateComponentInfo(UIComponent component)
- {
- final String id = component.getId();
- final String parentId = component.getParent() == null ? null : component.getParent().getId();
- final String componentFamily = component.getFamily();
- final String renderFamily = component.getRendererType();
- final String componentType = null;
- final String componentClass = component.getClass().getCanonicalName();
-
- return ComponentFactory.createComponentInfo
- (id, parentId, componentFamily, renderFamily, componentType, componentClass);
- }
-
- private static FacetInfo calculateFacetInfo(UIComponent component)
- {
- final String id = component.getId();
- final String parentId = component.getParent() == null ? null : component.getParent().getId();
- final String componentFamily = component.getFamily();
- final String renderFamily = component.getRendererType();
- final String componentType = null;
- final String componentClass = component.getClass().getCanonicalName();
-
- return ComponentFactory.createFacetInfo
- (id, parentId, componentFamily, renderFamily, componentType, componentClass);
- }
-
- private static UIInputInfo calculateUIInput(UIInput uiInput)
- {
- final String id = uiInput.getId();
- final String parentId = uiInput.getParent() == null ? null : uiInput.getParent().getId();
- final String componentFamily = uiInput.getFamily();
- final String renderFamily = uiInput.getRendererType();
- final String componentType = null;
- final String componentClass = uiInput.getClass().getCanonicalName();
- final String isValid = Boolean.toString(uiInput.isValid());
- final String isImmediate = Boolean.toString(uiInput.isImmediate());
- final String isRequired = Boolean.toString(uiInput.isRequired());
- final String isRendered = Boolean.toString(uiInput.isRendered());
-
- return ComponentFactory.createUIInputInfo
- (id, parentId, componentFamily, renderFamily, isValid, isImmediate, isRequired, isRendered, componentType, componentClass);
- }
-
- private static UIOutputInfo calculateUIOutput(UIOutput uiOutput)
- {
- final String id = uiOutput.getId();
- final String parentId = uiOutput.getParent() == null ? null : uiOutput.getParent().getId();
- final String componentFamily = uiOutput.getFamily();
- final String renderFamily = uiOutput.getRendererType();
- final String componentType = null;
- final String componentClass = uiOutput.getClass().getCanonicalName();
- final String isRendered = Boolean.toString(uiOutput.isRendered());
-
- return ComponentFactory.createUIOutputInfo
- (id, parentId, componentFamily, renderFamily, isRendered, componentType, componentClass);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/instrumentation/src/instrument/PhaseListener1.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/instrumentation/src/instrument/PhaseListener1.java
deleted file mode 100644
index f24e970..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/instrumentation/src/instrument/PhaseListener1.java
+++ /dev/null
@@ -1,332 +0,0 @@
-package instrument;
-
-import java.io.IOException;
-import java.io.ObjectOutputStream;
-import java.io.Writer;
-import java.net.Socket;
-import java.net.UnknownHostException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Stack;
-import java.util.concurrent.LinkedBlockingQueue;
-
-import javax.faces.FactoryFinder;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIViewRoot;
-import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
-import javax.faces.event.PhaseEvent;
-import javax.faces.event.PhaseId;
-import javax.faces.event.PhaseListener;
-import javax.faces.render.RenderKit;
-import javax.faces.render.RenderKitFactory;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-
-import org.eclipse.jst.jsf.common.runtime.internal.debug.ComponentTreeMessage;
-import org.eclipse.jst.jsf.common.runtime.internal.debug.JSFMonitorMessage;
-import org.eclipse.jst.jsf.common.runtime.internal.debug.MonitorMessageFactory;
-import org.eclipse.jst.jsf.common.runtime.internal.debug.RenderAttribute;
-import org.eclipse.jst.jsf.common.runtime.internal.debug.RenderNode;
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.ComponentInfo;
-
-/**
- * @author cbateman
- *
- */
-public class PhaseListener1 implements PhaseListener
-{
- SocketClient _socketClient;
- ResponseWriter _savedRW;
- LoggingResponseWriter _injectRW;
-
- /**
- *
- */
- private static final long serialVersionUID = 6564874625827591775L;
-
- public PhaseListener1()
- {
- System.out.println("Initialized PhaseListener: "+this);
- _socketClient = new SocketClient(3702);
- Thread thread = new Thread(_socketClient);
- thread.start();
-
- }
-
- public void afterPhase(PhaseEvent event) {
- if(PhaseId.RENDER_RESPONSE.equals(event.getPhaseId()))
- {
- System.out.printf("afterPhase: %s, for view id: %s\n",event.getPhaseId(),event.getFacesContext().getViewRoot().getViewId());
- dumpComponentTree(event.getFacesContext());
-
- if (_savedRW != null)
- {
- event.getFacesContext().setResponseWriter(_savedRW);
- }
-
- if (_injectRW != null)
- {
- dumpNode(_injectRW._rootComponentNode, "");
- }
- }
- }
-
- private void dumpNode(RenderNode node, String prefix)
- {
- System.out.printf("%s%s for component %s\n", prefix, node.getRenderedNodeName(), node.getComponentId());
-
- for (final Iterator it = node.getChildren().iterator();it.hasNext();)
- {
- RenderNode child = (RenderNode) it.next();
- dumpNode(child, prefix+"\t");
- }
- }
-
- public void beforePhase(PhaseEvent event) {
- if (PhaseId.RENDER_RESPONSE.equals(event.getPhaseId()))
- {
- FacesContext facesContext = event.getFacesContext();
- RenderKitFactory renderFactory =
- (RenderKitFactory)FactoryFinder.getFactory(FactoryFinder.RENDER_KIT_FACTORY);
- RenderKit renderKit = renderFactory.getRenderKit(facesContext,
- facesContext.getViewRoot().getRenderKitId());
-
- _savedRW = facesContext.getResponseWriter();
-
- try
- {
- Writer writer = ((ServletResponse) facesContext.getExternalContext().getResponse()).getWriter();
- String charEncoding = ((ServletRequest)facesContext.getExternalContext().getRequest()).getCharacterEncoding();
- ResponseWriter responseWriter = renderKit.createResponseWriter
- (writer,
- null /*Default: get the allowed content-types from the accept-header*/,
- charEncoding);
- _injectRW = new LoggingResponseWriter(responseWriter);
- facesContext.setResponseWriter(_injectRW);
- }
- catch (IOException ioe)
- {
- ioe.printStackTrace();
- }
- }
-// System.out.printf("beforePhase: %s, for view id: %s\n",event.getPhaseId(),event.getFacesContext().getViewRoot().getViewId());
-// dumpComponentTree(event.getFacesContext());
- }
-
- public PhaseId getPhaseId() {
- return PhaseId.ANY_PHASE;
- }
-
- private void dumpComponentTree(final FacesContext facesContext)
- {
- final UIViewRoot root = facesContext.getViewRoot();
-
- if (root != null)
- {
- final String viewId = root.getViewId();
- final ComponentInfo rootComponent = MyMonitorMessageFactory.buildComponentTree(root,false);
- ComponentTreeMessage message =
- MonitorMessageFactory.createTreeMessage(viewId, rootComponent, _injectRW._rootComponentNode);
- _socketClient.put(message);
- }
- }
-
-
- private static class SocketClient implements Runnable
- {
- private final int _port;
-
- private LinkedBlockingQueue<JSFMonitorMessage> _queue =
- new LinkedBlockingQueue<JSFMonitorMessage>();
-
- SocketClient(final int port)
- {
- _port = port;
- }
-
- public void run()
- {
- JSFMonitorMessage buffer = null;
-
- try
- {
- while ((buffer = _queue.take()) != null)
- {
- Socket socket = null;
-
- try
- {
- socket = new Socket("127.0.0.1", _port);
- ObjectOutputStream stream = new ObjectOutputStream(socket.getOutputStream());
- stream.writeObject(buffer);
-// PrintWriter writer = new PrintWriter(socket.getOutputStream(), true);
-// writer.println(buffer);
-// writer.flush();
- } catch (UnknownHostException e) {
- e.printStackTrace();
- } catch (IOException e) {
- e.printStackTrace();
- }
- finally
- {
- if (socket != null && !socket.isClosed())
- {
- try {
- socket.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- }
- }
- }
- catch (InterruptedException e)
- {
- e.printStackTrace();
- }
- }
-
- public void put(JSFMonitorMessage message)
- {
- _queue.add(message);
- }
- }
-
- private static class LoggingResponseWriter extends ResponseWriter
- {
- private final ResponseWriter _wrapWriter;
- private final Stack/*<RenderNode>*/ _parentStack;
- private RenderNode _curNode;
- private RenderNode _rootComponentNode;
-
- // map component id to the root rendernode rendered for it
- private Map _componentToHtml;
-
- LoggingResponseWriter(ResponseWriter wrapWriter)
- {
- _wrapWriter = wrapWriter;
- _parentStack = new Stack();
-
- _componentToHtml = new HashMap/*<String,RenderNode>*/();
- }
-
- public ResponseWriter cloneWithWriter(Writer writer) {
- return _wrapWriter.cloneWithWriter(writer);
- }
-
- public void endDocument() throws IOException {
- _wrapWriter.endDocument();
- }
-
- public void endElement(String element) throws IOException {
- _curNode = (RenderNode) _parentStack.pop();
- _wrapWriter.endElement(element);
- }
-
- public void flush() throws IOException {
- _wrapWriter.flush();
- }
-
- public String getCharacterEncoding() {
- return _wrapWriter.getCharacterEncoding();
- }
-
- public String getContentType() {
- return _wrapWriter.getContentType();
- }
-
- public void startDocument() throws IOException {
- _rootComponentNode = new RenderNode(null, null);
- _wrapWriter.startDocument();
- }
-
- public void startElement(String elementName, UIComponent component)
- throws IOException
- {
- String componentId = null;
-
- if (component != null)
- {
- componentId = component.getId();
- }
-
- RenderNode oldNode = _curNode;
- // push the curNode. Pushing null indicates the root of the document
- _parentStack.push(oldNode);
-
- _curNode = new RenderNode(componentId, elementName);
-
- // note that assumption here is that the first html element
- // we see corresponding to a component is the root of its
- // html tree. This may not be true if a component renders
- // more than one root element or if the output is generated
- // any thing but pre-order (parent first) tranversal of the
- // component tree. TODO: this algorithm needs refining
- if (!_componentToHtml.containsKey(componentId))
- {
- _componentToHtml.put(componentId, _curNode);
- }
-
- // if the current node isn't null, then append this new element
- if (oldNode != null)
- {
- oldNode.getChildren().add(_curNode);
- }
- // otherwise, we are at the doc root, so append there instead
- else
- {
- _rootComponentNode.getChildren().add(_curNode);
- }
-
-
- // do the normal write
- _wrapWriter.startElement(elementName, component);
- }
-
- public void writeAttribute(String name, Object value, String componentPropertyName)
- throws IOException {
-
- System.out.printf("%s: [%s,%s]\n", name, value.toString(), componentPropertyName);
- final RenderAttribute attribute =
- new RenderAttribute(name, value.toString(), componentPropertyName);
-
- if (_curNode != null)
- {
- _curNode.getRenderedAttributes().add(attribute);
- }
- _wrapWriter.writeAttribute(name, value, componentPropertyName);
- }
-
- public void writeComment(Object obj) throws IOException {
- _wrapWriter.writeComment(obj);
- }
-
- public void writeText(Object arg0, String arg1) throws IOException {
- _wrapWriter.writeText(arg0, arg1);
- }
-
- public void writeText(char[] arg0, int arg1, int arg2)
- throws IOException {
- _wrapWriter.writeText(arg0, arg1, arg2);
- }
-
- public void writeURIAttribute(String arg0, Object arg1, String arg2)
- throws IOException {
- _wrapWriter.writeURIAttribute(arg0, arg1, arg2);
- }
-
- public void close() throws IOException {
- _wrapWriter.close();
- }
-
- public void write(char[] cbuf, int off, int len) throws IOException {
- _wrapWriter.write(cbuf, off, len);
- }
-
- public ResponseWriter getWrapWriter() {
- return _wrapWriter;
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/JSFCommonRuntimePlugin.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/JSFCommonRuntimePlugin.java
deleted file mode 100644
index d17c6f5..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/JSFCommonRuntimePlugin.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.eclipse.jst.jsf.common.runtime.internal;
-
-import org.eclipse.core.runtime.ILog;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class JSFCommonRuntimePlugin extends Plugin {
-
- /**
- * The plug-in ID
- */
- public static final String PLUGIN_ID = "CommonComponentPlugin";
-
- // The shared instance
- private static JSFCommonRuntimePlugin plugin;
-
- /**
- * The constructor
- */
- public JSFCommonRuntimePlugin() {
- // empty constructor
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- public void start(final BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(final BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static JSFCommonRuntimePlugin getDefault() {
- return plugin;
- }
-
- /**
- * @param message
- * @param t
- */
- public static void log(final String message, final Throwable t)
- {
- final ILog log = getDefault().getLog();
- final IStatus status = new Status(IStatus.ERROR, PLUGIN_ID, message, t);
- log.log(status);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/debug/ComponentTreeMessage.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/debug/ComponentTreeMessage.java
deleted file mode 100644
index 7507739..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/debug/ComponentTreeMessage.java
+++ /dev/null
@@ -1,236 +0,0 @@
-package org.eclipse.jst.jsf.common.runtime.internal.debug;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.ComponentInfo;
-
-
-/**
- * Represents a component tree in message for that can be serialized.
- *
- * @author cbateman
- *
- */
-public class ComponentTreeMessage extends JSFMonitorMessage
-{
- /**
- *
- */
- private static final long serialVersionUID = -6282344329821994209L;
- private String _viewId;
- private ComponentInfo _treeRoot;
- private RenderNode _renderRoot;
- // private HashMap<String, ComponentInfo> _idIndex;
-
- /**
- * default constructor
- */
- public ComponentTreeMessage()
- {
- //_idIndex = new HashMap<String, ComponentInfo>();
- }
-
- /**
- * @return the view id
- */
- public final String getViewId() {
- return _viewId;
- }
-
- /**
- * @return the componentinfo at the root of the component tree
- */
- public final ComponentInfo getTreeRoot() {
- return _treeRoot;
- }
-
- /**
- * @return the rendered root node
- */
- public final RenderNode getRenderRoot() {
- return _renderRoot;
- }
-
- final void setRenderRoot(RenderNode renderRoot) {
- _renderRoot = renderRoot;
- }
-
- final void setTreeRoot(ComponentInfo treeRoot)
- {
- _treeRoot = treeRoot;
- }
-
- final void setViewId(final String viewId)
- {
- _viewId = viewId;
- }
-
-// @Override
-// protected void deserialize(InputStream inStream) throws IOException, ClassNotFoundException
-// {
-// ObjectInputStream objectInputStream = new ObjectInputStream(inStream);
-//
-// Object obj = objectInputStream.readObject();
-// int bytesRead = super.deserialize(inStream);
-//
-// // first line must be startView
-// final BufferedReader reader =
-// new BufferedReader(new InputStreamReader(inStream));
-//
-// String line = reader.readLine();
-//
-// if (line != null
-// && line.startsWith(START_VIEW))
-// {
-// _viewId = line.substring(START_VIEW.length()).trim();
-// bytesRead += line.length()+1;
-// }
-//
-// // loop until EOF
-// while ((line = reader.readLine())!=null)
-// {
-// bytesRead += line.length()+1;
-//
-// if (line.startsWith("component:"))
-// {
-// parseComponent(line.substring("component:".length()).trim());
-// }
-// else if (line.startsWith("facet:"))
-// {
-// parseFacet(line.substring("facet:".length()).trim());
-// }
-// else if (line.startsWith("uiInput:"))
-// {
-// parseUIInput(line.substring("uiInput:".length()).trim());
-// }
-// else if (line.startsWith("uiOutput:"))
-// {
-// parseUIOutput(line.substring("uiOutput:".length()).trim());
-// }
-// else if (line.startsWith("endView"))
-// {
-// //
-// }
-// }
-// return bytesRead;
-// }
-
-// private ComponentInfo parseComponent(final String line)
-// {
-// final String[] fields = line.split(",");
-// if (fields.length >= 4)
-// {
-// String parentId = "!".equals(fields[0]) ? null : fields[0];
-// String id = "!".equals(fields[1]) ? null : fields[1];
-// String componentFamily = fields[2];
-// String renderFamily = fields[3];
-//
-// ComponentInfo componentInfo =
-// ComponentFactory.createComponentInfo
-// (id, parentId, componentFamily, renderFamily);
-//
-// if (id == null)
-// {
-// _treeRoot = componentInfo;
-// _idIndex.put(null, componentInfo);
-// }
-// else
-// {
-// _idIndex.put(id, componentInfo);
-//
-// ComponentInfo parent =
-// (ComponentInfo)_idIndex.get(parentId);
-//
-// if (parent != null)
-// {
-// parent.getChildren().add(componentInfo);
-// }
-// else
-// {
-// _treeRoot.getChildren().add(componentInfo);
-// }
-// }
-// }
-// return null;
-// }
-//
-// private FacetInfo parseFacet(final String line)
-// {
-// final String[] fields = line.split(",");
-//
-// if (fields.length >= 4)
-// {
-// String parentId = "!".equals(fields[0]) ? null : fields[0];
-// String id = "!".equals(fields[1]) ? null : fields[1];
-// String componentFamily = fields[2];
-// String renderFamily = fields[3];
-//
-// FacetInfo facetInfo =
-// ComponentFactory.createFacetInfo(id, parentId, componentFamily, renderFamily);
-// ComponentInfo parent = _idIndex.get(parentId);
-//
-// if (parent != null)
-// {
-// parent.getChildren().add(facetInfo);
-// }
-//
-// return facetInfo;
-// }
-// return null;
-// }
-//
-// private UIInputInfo parseUIInput(final String line)
-// {
-// final String[] fields = line.split(",");
-//
-// if (fields.length >= 7)
-// {
-// String parentId = "!".equals(fields[0]) ? null : fields[0];
-// String id = "!".equals(fields[1]) ? null : fields[1];
-// String componentFamily = fields[2];
-// String renderFamily = fields[3];
-// String isValid = fields[4];
-// String isImmediate = fields[5];
-// String isRequired = fields[6];
-// String isRendered = fields[7];
-//
-// UIInputInfo uiInputInfo =
-// ComponentFactory.createUIInputInfo
-// (id, parentId, componentFamily, renderFamily, isValid, isImmediate, isRequired, isRendered);
-// ComponentInfo parent = _idIndex.get(parentId);
-//
-// if (parent != null)
-// {
-// parent.getChildren().add(uiInputInfo);
-// }
-//
-// return uiInputInfo;
-// }
-// return null;
-// }
-//
-// private UIOutputInfo parseUIOutput(final String line)
-// {
-// final String[] fields = line.split(",");
-//
-// if (fields.length >= 4)
-// {
-// String parentId = "!".equals(fields[0]) ? null : fields[0];
-// String id = "!".equals(fields[1]) ? null : fields[1];
-// String componentFamily = fields[2];
-// String renderFamily = fields[3];
-// String isRendered = fields[4];
-//
-// UIOutputInfo uiOutputInfo =
-// ComponentFactory.createUIOutputInfo(id, parentId, componentFamily, renderFamily, isRendered);
-//
-// ComponentInfo parent = _idIndex.get(parentId);
-//
-// if (parent != null)
-// {
-// parent.getChildren().add(uiOutputInfo);
-// }
-//
-// return uiOutputInfo;
-// }
-// return null;
-// }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/debug/JSFMonitorMessage.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/debug/JSFMonitorMessage.java
deleted file mode 100644
index f4c89dd..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/debug/JSFMonitorMessage.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.eclipse.jst.jsf.common.runtime.internal.debug;
-
-import java.io.Serializable;
-
-/**
- * Super of all messages that are sent by the JSF debug monitor
- * @author cbateman
- *
- */
-public abstract class JSFMonitorMessage implements Serializable
-{
- /**
- *
- */
- private static final long serialVersionUID = -5417558019077000040L;
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/debug/MonitorMessageFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/debug/MonitorMessageFactory.java
deleted file mode 100644
index eef2154..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/debug/MonitorMessageFactory.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.eclipse.jst.jsf.common.runtime.internal.debug;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.ComponentInfo;
-
-/**
- * Creates JSF remote monitor messages.
- *
- * @author cbateman
- *
- */
-public class MonitorMessageFactory
-{
- /**
- * @param viewId
- * @param root
- * @param renderRoot
- * @return a new component tree message for the parameters
- */
- public static ComponentTreeMessage createTreeMessage(final String viewId, final ComponentInfo root, final RenderNode renderRoot)
- {
- ComponentTreeMessage message = new ComponentTreeMessage();
- message.setViewId(viewId);
- message.setTreeRoot(root);
- message.setRenderRoot(renderRoot);
- return message;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/debug/RenderAttribute.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/debug/RenderAttribute.java
deleted file mode 100644
index 1a763f6..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/debug/RenderAttribute.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.eclipse.jst.jsf.common.runtime.internal.debug;
-
-/**
- * Information about a rendered XML attribute
- *
- * @author cbateman
- *
- */
-public class RenderAttribute extends JSFMonitorMessage {
-
- /**
- *
- */
- private static final long serialVersionUID = -4601065346261130623L;
-
- private final String _name; // the name of the attribute. TODO: local vs. namespace?
- private final String _value; // the rendered value of the node
- private final String _propertyName; // the property name on the corresponding component
- // may be null
- /**
- * @param name
- * @param value
- * @param propertyName
- */
- public RenderAttribute(String name, String value, String propertyName) {
- super();
- _name = name;
- _propertyName = propertyName;
- _value = value;
- }
- /**
- * @return the name of the attribute
- */
- public final String getName() {
- return _name;
- }
- /**
- * @return the attribute's value
- */
- public final String getValue() {
- return _value;
- }
- /**
- * @return the name of the corresponding component property if any.
- */
- public final String getPropertyName() {
- return _propertyName;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/debug/RenderNode.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/debug/RenderNode.java
deleted file mode 100644
index 1096f9d..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/debug/RenderNode.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.eclipse.jst.jsf.common.runtime.internal.debug;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * A rendered XML node.
- *
- * @author cbateman
- *
- */
-public class RenderNode extends JSFMonitorMessage
-{
- /**
- *
- */
- private static final long serialVersionUID = -2843929405836710015L;
-
- private final String _componentId; // the id of the component id that caused the node to render
- private final String _renderedNodeName; // the node
- private final List/*<RenderedAttribute>*/ _renderedAttributes; // attributes
- private final List _children; // the rendered children of renderedNode based
- // on the output document hiearchy
- /**
- * @param componentId
- * @param renderedNodeName
- */
- public RenderNode(String componentId, String renderedNodeName) {
- super();
- _componentId = componentId;
- _renderedNodeName = renderedNodeName;
-
- _children = new ArrayList();
- _renderedAttributes = new ArrayList();
- }
- /**
- * @return the corresponding component's id
- */
- public final String getComponentId() {
- return _componentId;
- }
- /**
- * @return the node's children
- */
- public final List getChildren() {
- return _children;
- }
- /**
- * @return the name of the rendered node (element)
- */
- public final String getRenderedNodeName() {
- return _renderedNodeName;
- }
- /**
- * @return the attributes of this node as rendered.
- */
- public final List getRenderedAttributes() {
- return _renderedAttributes;
- }
- public String toString()
- {
- String toString = "Root node: "+_renderedNodeName+", attributes: [";
-
- for (Iterator it = _renderedAttributes.iterator(); it.hasNext();)
- {
- final RenderAttribute attribute = (RenderAttribute) it.next();
- toString+=attribute.getName() + "=" + attribute.getValue();
-
- toString+=it.hasNext() ? ", " : "]";
- }
-
- return toString;
- }
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/ViewObject.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/ViewObject.java
deleted file mode 100644
index a530676..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/ViewObject.java
+++ /dev/null
@@ -1,289 +0,0 @@
-package org.eclipse.jst.jsf.common.runtime.internal.model;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.Decorator;
-
-/**
- * The base type of all objects that participate in the lifecycle of a view.
- * This may be used to hold either design time or runtime information.
- *
- * @author cbateman
- *
- */
-public abstract class ViewObject implements Serializable /* IAdaptable? */
-{
- private Map/* <Class, List<Decorator>> */_decorators;
- private Map/* <Class, Object> */_adapters;
-
- /**
- *
- */
- private static final long serialVersionUID = 1592205691642453075L;
-
- /**
- * This call may be create a new data structure and should be considered of
- * much higher cost than most calls.
- *
- * @return all decorators of this object. List should be assumed by clients
- * to be unmodifiable and may throw mutation exceptions
- */
- public List getAllDecorators() {
- final int size = getDecoratorMap().size();
-
- if (size == 0) {
- return Collections.EMPTY_LIST;
- }
-
- final List allDecorators = new ArrayList();
- for (final Iterator entryIt = getDecoratorMap().entrySet().iterator(); entryIt
- .hasNext();) {
- final Map.Entry entry = (Map.Entry) entryIt.next();
- final List decorators = (List) entry.getValue();
- allDecorators.addAll(decorators);
- }
-
- return Collections.unmodifiableList(allDecorators);
- }
-
- /**
- * @param decoratorType
- * @return all decorators of this object associated with the class type. The
- * returned list should be assumed to be unmodifiable. Returns an
- * empty list if no decorators are associated with decoratorType
- */
- public List getDecorators(final Class decoratorType) {
- final List decorators = (List) getDecoratorMap().get(decoratorType);
-
- if (decorators == null) {
- return Collections.EMPTY_LIST;
- }
- return Collections.unmodifiableList(decorators);
- }
-
- /**
- * Add the decorator using decorator.getClass to associate the type. Must be
- * equivalent to addDecorator(decorator, decorator.getClass());
- *
- * @param decorator
- * the decorator to add. <b>Must NOT be null.</b>
- * @throws IllegalArgumentException
- * if decorator is null.
- */
- public void addDecorator(final Decorator decorator) {
- if (decorator == null) {
- throw new IllegalArgumentException("Arguments must not be null");
- }
- final Class associationType = decorator.getClass();
- addDecorator(decorator, associationType);
- }
-
- /**
- * Add the decorator using the associatedType. Normally you should call
- * {@link #addDecorator(Decorator)} however in some cases you may wish to
- * associated a decorator with a class type other than its own. For example,
- * sub-classes of ValidatorDecorator will want to associated with
- * ValidatorDecorator.getClass() in most cases so that it is included in any
- * common examination of component validators.
- *
- * @param decorator
- * to add. <b>Must NOT be null.</b>
- * @param associatedType
- * the key to store decorator <b>Must NOT be null</b>
- * @throws IllegalArgumentException
- * if decorator or associatedType is null
- */
- public void addDecorator(final Decorator decorator,
- final Class associatedType) {
- if (decorator == null || associatedType == null) {
- throw new IllegalArgumentException("Arguments must not be null");
- }
-
- List decoratorsByType = (List) getDecoratorMap().get(associatedType);
-
- if (decoratorsByType == null) {
- decoratorsByType = new ArrayList(2);
- getDecoratorMap().put(associatedType, decoratorsByType);
- }
-
- decoratorsByType.add(decorator);
- }
-
- /**
- * Removes decorator if it is associated to associatedType on this view
- * object.
- *
- * @param decorator
- * @param associatedType
- * @return true if the decorator was found and removed.
- * @throws IllegalArgumentException
- * if decorator or associatedType is null
- */
- public boolean removeDecorator(final Decorator decorator,
- final Class associatedType) {
- if (decorator == null || associatedType == null) {
- throw new IllegalArgumentException("Arguments must not be null");
- }
-
- final List decoratorsByType = (List) getDecoratorMap().get(
- associatedType);
-
- if (decoratorsByType != null) {
- return decoratorsByType.remove(decorator);
- }
-
- return false;
- }
-
- /**
- * <p>Get the adapter associated the class key.</p>
- *
- * <p>If addAdapter has been called with adapterType, then this
- * adapter object should always be called. In the default implementation,
- * if there is no explicit adapter, "this" is returned if (this instanceof adapterType).
- *
- * @param adapterType
- * @return the interface adapter associated with the class key or null if
- * not found
- */
- public Object getAdapter(final Class adapterType) {
- if (adapterType == null) {
- return null;
- }
-
- Object adapter = getAdapterMap().get(adapterType);
-
- if (adapter == null)
- {
- if (adapterType.isInstance(this)) {
- adapter = this;
- }
- }
-
- return adapter;
- }
-
- /**
- * Adds the interface adapter object under adapterType key. There can be at
- * most one adapter registered for each class key.
- *
- * It is an error (throws exception) to try to add an adapter for adapterType
- * which this is already instance. This restriction is necessary because
- * otherwise local getters/setters would need to be aware of the adapter
- * mechanism and verify inheritance hierarchies on every calls. This
- * mechanism is intended only for adding interfaces to view object impls
- * that don't already have them.
- *
- * @param adapterType
- * @param adapter
- * @throws IllegalArgumentException
- * if adapterType or adapter is null or if casting adapter to
- * adapterType would * cause a ClassCastException (i.e. if
- * !(adapter instanceof adapterType))
- * OR if this is already an instance of adapterType.
- */
- public void addAdapter(final Class adapterType, final Object adapter) {
- if (adapterType == null || adapter == null) {
- throw new IllegalArgumentException("Arguments must not be null");
- }
-
- if (!adapterType.isInstance(adapter)) {
- throw new IllegalArgumentException("adapter: " + adapter
- + " must be cast compatible to class: " + adapterType);
- }
- else if (adapterType.isInstance(this))
- {
- throw new IllegalArgumentException("this: " + this
- + " must not already be an instance of class: " + adapterType);
- }
- getAdapterMap().put(adapterType, adapter);
- }
-
- /**
- * Note that {@link #getAdapter(Class)} may still return non-null after
- * this is called if (this instanceof adapterType).
- *
- * @param adapterType
- * @return the adapter for adapterType that was just removed or null if not
- * found
- */
- public Object removeAdapter(final Class adapterType) {
- return getAdapterMap().remove(adapterType);
- }
-
- /**
- * Note that this only returns those adapters added using
- * {@link #addAdapter(Class, Object)}. It does not return any
- * implicit adapters resulting from (this instanceof type).
- *
- * @return the map of all adapters. Maps is immutable and may throw
- * exceptions on attempts to mutate.
- */
- public Map getAllAdapters()
- {
- if (getAdapterMap().size() == 0)
- {
- return Collections.EMPTY_MAP;
- }
- return Collections.unmodifiableMap(getAdapterMap());
- }
-
- /**
- * <p>
- * The contract for this method is that it must always return a usable Map
- * and that map must be the same on every call. Lazy construction may be
- * used (as it is by default). The default map size is 4 and load factor is
- * 3 meaning that there should be decent tradeoff between wasted table size
- * and overhead used to increase it should the number of decorators exceed
- * 3. <b>Must never return null.</b>
- * </p>
- *
- * <p>
- * Generally, the method should not need to be overridden, however it is
- * provided to allow sub-classes to change the way the decorators map is
- * constructed.
- * </p>
- *
- * @return the map containing lists of decorators keyed by class.
- *
- */
- protected Map getDecoratorMap() {
- if (_decorators == null) {
- _decorators = new HashMap(4);
- }
- return _decorators;
- }
-
- /**
- * <p>
- * The contract for this method is that it must always return a usable Map
- * and that map must be the same on every call. Lazy construction may be
- * used (as it is by default). The default map size is 4 and load factor is
- * 3 meaning that there should be decent tradeoff between wasted table size
- * and overhead used to increase it should the number of decorators exceed
- * 3. <b>Must never return null.</b>
- * </p>
- *
- * <p>
- * Generally, the method should not need to be overridden, however it is
- * provided to allow sub-classes to change the way the decorators map is
- * constructed.
- * </p>
- *
- * @return the map containing lists of adapters keyed by class.
- *
- */
- protected Map getAdapterMap() {
- if (_adapters == null) {
- _adapters = new HashMap(4);
- }
-
- return _adapters;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/bean/DataModelInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/bean/DataModelInfo.java
deleted file mode 100644
index b07a1bd..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/bean/DataModelInfo.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.eclipse.jst.jsf.common.runtime.internal.model.bean;
-
-import java.io.Serializable;
-
-/**
- * Design time analog of runtime DataModel bean
- *
- * @author cbateman
- *
- */
-public class DataModelInfo implements Serializable
-{
- /**
- * serializable id
- */
- private static final long serialVersionUID = 6461056497382677871L;
-
- private final boolean _rowAvailable;
- private final int _rowCount;
- private final SerializableObject _rowData;
- private final int _rowIndex;
- private final SerializableObject _wrappedData;
-
- /**
- * @param rowAvailable
- * @param rowCount
- * @param rowData
- * @param rowIndex
- * @param wrappedData
- */
- public DataModelInfo(boolean rowAvailable, int rowCount, Object rowData,
- int rowIndex, Object wrappedData) {
- super();
- _rowAvailable = rowAvailable;
- _rowCount = rowCount;
- _rowData = new SerializableObject(rowData);
- _rowIndex = rowIndex;
- _wrappedData = new SerializableObject(wrappedData);
- }
-
- /**
- * @return true if the current row is available
- */
- public final boolean isRowAvailable() {
- return _rowAvailable;
- }
- /**
- * @return the row count of this model
- */
- public final int getRowCount() {
- return _rowCount;
- }
- /**
- * @return the row data
- */
- public final Object getRowData() {
- return _rowData.getMaybeSerializable();
- }
- /**
- * @return the row index
- */
- public final int getRowIndex() {
- return _rowIndex;
- }
- /**
- * @return the wrapped data. may be null if wrapped object was not
- * serializable.
- */
- public final Object getWrappedData() {
- return _wrappedData.getMaybeSerializable();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/bean/SerializableObject.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/bean/SerializableObject.java
deleted file mode 100644
index 85c222e..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/bean/SerializableObject.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.eclipse.jst.jsf.common.runtime.internal.model.bean;
-
-import java.io.IOException;
-import java.io.NotSerializableException;
-import java.io.Serializable;
-
-/**
- * A special object used in place of Object to ensure that when an interface
- * requires a generic #{@link java.lang.Object}, it won't throw serialization
- * exception when a containing object is serialized.
- *
- * @author cbateman
- *
- */
-public class SerializableObject implements Serializable
-{
- /**
- *
- */
- private static final long serialVersionUID = 9133733048469500692L;
- private Object _maybeSerializable;
-
- /**
- * @param maybeSerializable
- */
- public SerializableObject(Object maybeSerializable)
- {
- _maybeSerializable = maybeSerializable;
- }
-
-
-// /**
-// * Provided to support serialization. Should not be used by sub-classes
-// * or clients except in this regard.
-// */
-// protected SerializableObject()
-// {
-// _maybeSerializable = null;
-// }
-
- /**
- * @return the actual value
- */
- public final Object getMaybeSerializable() {
- return _maybeSerializable;
- }
-
-
- private void writeObject(java.io.ObjectOutputStream out)
- throws IOException
- {
- try
- {
- out.writeObject(_maybeSerializable);
- }
- catch (NotSerializableException nse)
- {
- // do nothing, the object isn't guaranteed to be serializable,
- // but we don't want this be an error
- out.writeObject(null);
- }
- }
-
- private void readObject(java.io.ObjectInputStream in)
- throws IOException, ClassNotFoundException
- {
- _maybeSerializable = in.readObject();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/behavioural/ActionSourceInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/behavioural/ActionSourceInfo.java
deleted file mode 100644
index c0e0ea2..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/behavioural/ActionSourceInfo.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.eclipse.jst.jsf.common.runtime.internal.model.behavioural;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ActionListenerDecorator;
-
-/**
- * Implementation of the ActionSourceInfo.
- *
- * @author cbateman
- *
- */
-public class ActionSourceInfo implements IActionSourceInfo
-{
- /**
- * serializable id
- */
- private static final long serialVersionUID = 6531166406473466685L;
-
- private final String _action;
- private final String _actionListener;
- private final boolean _immediate;
- private List/*<ActionListenerDecorator>*/ _actionListeners;
-
- /**
- * @param action
- * @param actionListener
- * @param immediate
- */
- public ActionSourceInfo(final String action, final String actionListener,
- final boolean immediate)
- {
- super();
- _action = action;
- _actionListener = actionListener;
- _immediate = immediate;
- }
-
- public void addActionListener(final ActionListenerDecorator actionListener) {
- if (_actionListeners == null)
- {
- _actionListeners = new ArrayList(2);
- }
- _actionListeners.add(actionListener);
- }
-
- public String getAction() {
- return _action;
- }
-
- public String getActionListener() {
- return _actionListener;
- }
-
- public List getActionListeners() {
- if (_actionListeners == null)
- {
- return Collections.EMPTY_LIST;
- }
- return Collections.unmodifiableList(_actionListeners);
- }
-
- public boolean isImmediate() {
- return _immediate;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/behavioural/ActionSourceInfo2.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/behavioural/ActionSourceInfo2.java
deleted file mode 100644
index 0815a07..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/behavioural/ActionSourceInfo2.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.eclipse.jst.jsf.common.runtime.internal.model.behavioural;
-
-/**
- * Implementation of the IActionSource2Info
- *
- * @author cbateman
- *
- */
-public class ActionSourceInfo2 extends ActionSourceInfo implements
- IActionSource2Info
-{
- /**
- * serializable id
- */
- private static final long serialVersionUID = 5811194815559772378L;
- private final String _actionExpression;
-
- /**
- * @param action
- * @param actionListener
- * @param immediate
- * @param actionExpression
- */
- public ActionSourceInfo2(final String action, final String actionListener,
- final boolean immediate, final String actionExpression) {
- super(action, actionListener, immediate);
- _actionExpression = actionExpression;
- }
-
- public String getActionExpression() {
- return _actionExpression;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/behavioural/EditableValueHolderInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/behavioural/EditableValueHolderInfo.java
deleted file mode 100644
index d9b9689..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/behavioural/EditableValueHolderInfo.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package org.eclipse.jst.jsf.common.runtime.internal.model.behavioural;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ConverterDecorator;
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ValidatorDecorator;
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ValueChangeListenerDecorator;
-
-/**
- * Implementation of the IEditableValueHolderInfo
- *
- * @author cbateman
- *
- */
-public class EditableValueHolderInfo extends ValueHolderInfo implements
- IEditableValueHolderInfo
-{
- /**
- *
- */
- private static final long serialVersionUID = -2115990809157328451L;
-
- private final boolean _localSetValue;
- private final Object _submittedValue;
- private final String _validator;
- private final String _valueChangeListener;
- private final boolean _isImmediate;
- private final boolean _isRequired;
- private final boolean _isValid;
- private List _validators;
- private List _valueChangeListeners;
-
- /**
- * @param converterDecorator
- * @param localValue
- * @param value
- * @param isImmediate
- * @param isRequired
- * @param isValid
- * @param localSetValue
- * @param submittedValue
- * @param validator
- * @param valueChangeListener
- */
- public EditableValueHolderInfo(final ConverterDecorator converterDecorator,
- final Object localValue, final Object value, final boolean isImmediate,
- final boolean isRequired, final boolean isValid, final boolean localSetValue,
- final Object submittedValue, final String validator, final String valueChangeListener)
- {
- super(converterDecorator, localValue, value);
- _isImmediate = isImmediate;
- _isRequired = isRequired;
- _isValid = isValid;
- _localSetValue = localSetValue;
- _submittedValue = submittedValue;
- _validator = validator;
- _valueChangeListener = valueChangeListener;
- }
-
- public final boolean isLocalSetValue() {
- return _localSetValue;
- }
-
- public final Object getSubmittedValue() {
- return _submittedValue;
- }
-
- public final String getValidator() {
- return _validator;
- }
-
- public final String getValueChangeListener() {
- return _valueChangeListener;
- }
-
- public final boolean isImmediate() {
- return _isImmediate;
- }
-
- public final boolean isRequired() {
- return _isRequired;
- }
-
- public final boolean isValid() {
- return _isValid;
- }
-
- public void addValidator(final ValidatorDecorator validator)
- {
- if (_validators == null)
- {
- _validators = new ArrayList(2);
- }
- _validators.add(validator);
- }
-
- public void addValueChangeListener(
- final ValueChangeListenerDecorator valueChangeListenerInfo)
- {
- if (_valueChangeListeners == null)
- {
- _valueChangeListeners = new ArrayList(2);
- }
- _valueChangeListeners.add(valueChangeListenerInfo);
- }
-
- public List getValidators() {
- if (_validators == null)
- {
- return Collections.EMPTY_LIST;
- }
-
- return Collections.unmodifiableList(_validators);
- }
-
- public List getValueChangeListeners() {
- if (_valueChangeListeners == null)
- {
- return Collections.EMPTY_LIST;
- }
-
- return Collections.unmodifiableList(_valueChangeListeners);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/behavioural/IActionSource2Info.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/behavioural/IActionSource2Info.java
deleted file mode 100644
index 6fef11b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/behavioural/IActionSource2Info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.eclipse.jst.jsf.common.runtime.internal.model.behavioural;
-
-/**
- * Design-time analog for the ActionSource2 interface.
- *
- * @author cbateman
- *
- */
-public interface IActionSource2Info extends IActionSourceInfo
-{
- /**
- * TODO: this method is similar to getAction on ActionSource from
- * our perspective since the actual string rep of the EL is basically
- * the same...
- *
- * @return an EL method expression that represents a call to
- * an action method.
- */
- String getActionExpression();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/behavioural/IActionSourceInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/behavioural/IActionSourceInfo.java
deleted file mode 100644
index 4de338b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/behavioural/IActionSourceInfo.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.eclipse.jst.jsf.common.runtime.internal.model.behavioural;
-
-import java.io.Serializable;
-import java.util.List;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ActionListenerDecorator;
-
-/**
- * A design time analog for the runtime ActionSource interface.
- *
- * @author cbateman
- *
- */
-public interface IActionSourceInfo extends Serializable
-{
- /**
- * @return true if action listener associated with this action source
- * should be executed immediately after the apply request values phase.
- * Default is false.
- */
- boolean isImmediate();
-
-
- /**
- * Add the action listener to the list
- *
- * @param actionListener
- */
- void addActionListener(ActionListenerDecorator actionListener);
-
- /**
- * @return all action listeners registered. List should be considered
- * immutable and may throw exceptions if modified.
- */
- List/*<ActionListenerDecorator>*/ getActionListeners();
-
- /**
- * <b> NOTE: this method is deprecated in the runtime spec and exists for
- * backward compatibility with JSF 1.1. You should avoid using it except in
- * conjunction with JSF 1.1 tooling support. This method will be deprecated
- * once the runtime spec removes the underlying API</b>
-
- * @return a method binding expression describing an action handler
- */
- String getAction();
-
- /**
- * <b> NOTE: this method is deprecated in the runtime spec and exists for
- * backward compatibility with JSF 1.1. You should avoid using it except in
- * conjunction with JSF 1.1 tooling support. This method will be deprecated
- * once the runtime spec removes the underlying API</b>
- *
- * @return a method binding expression describing an action listener
- */
- String getActionListener();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/behavioural/IEditableValueHolderInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/behavioural/IEditableValueHolderInfo.java
deleted file mode 100644
index 823e24c..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/behavioural/IEditableValueHolderInfo.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package org.eclipse.jst.jsf.common.runtime.internal.model.behavioural;
-
-import java.util.List;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.ViewObject;
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ValidatorDecorator;
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ValueChangeListenerDecorator;
-
-/**
- * A design time analog for the JSF runtime EditableValueHolder interface.
- *
- * @author cbateman
- *
- */
-public interface IEditableValueHolderInfo extends IValueHolderInfo {
- /**
- * @return the flag indicating whether the value of the value holder should
- * be evaluated in the apply request values phase instead of the
- * process validations phase
- */
- boolean isImmediate();
-
- /**
- * @return true if the value has been set
- */
- boolean isLocalSetValue();
-
- /**
- * @return true if validation should consider this field required (must be
- * non-empty).
- */
- boolean isRequired();
-
- /**
- * @return the submitted, unconverted value of the component.
- */
- Object getSubmittedValue();
-
- /**
- * @return false if validation has determined that the value property of
- * this component is not valid.
- */
- boolean isValid();
-
- /**
- * <b> NOTE: this method is deprecated in the runtime spec and exists for
- * backward compatibility with JSF 1.1. You should avoid using it except in
- * conjunction with JSF 1.1 tooling support. This method will be deprecated
- * once the runtime spec removes the underlying API</b>
- *
- * @return a method binding expression that refers to a validator method
- */
- String getValidator();
-
- /**
- * <b> NOTE: this method is deprecated in the runtime spec and exists for
- * backward compatibility with JSF 1.1. You should avoid using it except in
- * conjunction with JSF 1.1 tooling support. This method will be deprecated
- * once the runtime spec removes the underlying API</b>
- *
- * @return a method binding expression that refers to a value change
- * listener
- */
- String getValueChangeListener();
-
- /**
- * Add validator to the list of validators for this component. Should be
- * equivalent to
- * {@link ViewObject#addDecorator(org.eclipse.jst.jsf.common.runtime.internal.model.decorator.Decorator, Class)}.
- *
- * @param validator
- */
- void addValidator(ValidatorDecorator validator);
-
- /**
- * @return the list of validators for this component. Should be considered
- * unmodifiable (may throw exception).
- */
- List/* <ValidatorDecorator> */getValidators();
-
- /**
- * Add the value change listener to this component.
- *
- * @param valueChangeListenerInfo
- */
- void addValueChangeListener(
- ValueChangeListenerDecorator valueChangeListenerInfo);
-
- /**
- * @return the list of value change listeners. Should be considered
- * unmodifiable (may throw exception).
- */
- List/* <ValueChangeListenerDecorator> */getValueChangeListeners();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/behavioural/INamingContainerInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/behavioural/INamingContainerInfo.java
deleted file mode 100644
index a9a07d1..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/behavioural/INamingContainerInfo.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.eclipse.jst.jsf.common.runtime.internal.model.behavioural;
-
-/**
- * Design time analog for the NamingContainer interface.
- *
- * @author cbateman
- *
- */
-public interface INamingContainerInfo
-{
- // tagging interface
-
- /**
- * Used as an adapter impl
- */
- public final static INamingContainerInfo ADAPTER = new INamingContainerInfo()
- {/* no impl */
- };
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/behavioural/IValueHolderInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/behavioural/IValueHolderInfo.java
deleted file mode 100644
index 7340f7f..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/behavioural/IValueHolderInfo.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.eclipse.jst.jsf.common.runtime.internal.model.behavioural;
-
-import java.io.Serializable;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ConverterDecorator;
-
-/**
- * Represents design time information about the ValueHolder behavioural
- * interface.
- *
- * @author cbateman
- *
- */
-public interface IValueHolderInfo extends Serializable
-{
- /**
- * @return the value, may be null
- */
- Object getValue();
-
- /**
- * @return the raw value without expression value evaluation. Note that
- * {@link #getValue()} may return the same value in cases where this value
- * holder is derived at design time without EL expression evaluation. May be null.
- */
- Object getLocalValue();
-
- /**
- * @return the converter for this value holder or null if none.
- */
- ConverterDecorator getConverter();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/behavioural/ValueHolderInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/behavioural/ValueHolderInfo.java
deleted file mode 100644
index 2a1ee6c..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/behavioural/ValueHolderInfo.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.eclipse.jst.jsf.common.runtime.internal.model.behavioural;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ConverterDecorator;
-
-/**
- * Implementation of the IValueHolderInfo.
- *
- * @author cbateman
- *
- */
-public class ValueHolderInfo implements IValueHolderInfo
-{
- /**
- *
- */
- private static final long serialVersionUID = 5000699728360703727L;
-
- /**
- * the value (may include EL evaluation)
- */
- protected final Object _value;
- /**
- * the raw value before EL evaluation.
- */
- protected final Object _localValue;
- /**
- * the converter or null if none.
- */
- protected final ConverterDecorator _converterDecorator;
-
- /**
- * @param converterDecorator
- * @param localValue
- * @param value
- */
- public ValueHolderInfo(final ConverterDecorator converterDecorator,
- final Object localValue, final Object value) {
- super();
- _converterDecorator = converterDecorator;
- _localValue = localValue;
- _value = value;
- }
- public final Object getValue() {
- return _value;
- }
- public final Object getLocalValue() {
- return _localValue;
- }
- public final ConverterDecorator getConverter() {
- return _converterDecorator;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/ComponentFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/ComponentFactory.java
deleted file mode 100644
index caf4716..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/ComponentFactory.java
+++ /dev/null
@@ -1,389 +0,0 @@
-package org.eclipse.jst.jsf.common.runtime.internal.model.component;
-
-import java.util.Map;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.bean.DataModelInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.behavioural.IActionSource2Info;
-import org.eclipse.jst.jsf.common.runtime.internal.model.behavioural.IActionSourceInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.behavioural.IEditableValueHolderInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.behavioural.INamingContainerInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.behavioural.IValueHolderInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ConverterDecorator;
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.FacetDecorator;
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ValidatorDecorator;
-import org.eclipse.jst.jsf.common.runtime.internal.model.event.IActionListenerInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.event.IValueChangeListenerInfo;
-
-/**
- * Factory for creating component related objects.
- *
- * @author cbateman
- *
- */
-public class ComponentFactory
-{
-
- /**
- * The key for the standard ValueHolder adapter interface
- */
- public final static Class VALUE_HOLDER = IValueHolderInfo.class;
- /**
- * The key for the standard EditableValueHolder adapter interface
- */
- public final static Class EDITABLE_VALUE_HOLDER = IEditableValueHolderInfo.class;
- /**
- * The key for the standard ActionSource adapter interface
- */
- public final static Class ACTION_SOURCE = IActionSourceInfo.class;
- /**
- * The key for the standard ActionSource2 adapter interface
- */
- public final static Class ACTION_SOURCE2 = IActionSource2Info.class;
- /**
- * The key for the standard NamingContainer adapter interface
- */
- public final static Class NAMING_CONTAINER = INamingContainerInfo.class;
-
- /**
- * The key for the standard Converter decorator
- */
- public final static Class CONVERTER = ConverterDecorator.class;
- /**
- * The key for the standard Facet decorator
- */
- public final static Class FACET = FacetDecorator.class;
- /**
- * The key for the standard Validator decorator
- */
- public final static Class VALIDATOR = ValidatorDecorator.class;
- /**
- * The key for the standard ValueChangeListener decorator
- */
- public final static Class VALUE_CHANGE_LISTENER = IValueChangeListenerInfo.class;
- /**
- * The key for the standard ActionListener decorator
- */
- public final static Class ACTION_LISTENER = IActionListenerInfo.class;
-
- /**
- * Base class name for UIInput's
- */
- public final static String BASE_CLASS_UIINPUT = "javax.faces.component.UIInput";
- /**
- * Base class name for UIOutput's
- */
- public final static String BASE_CLASS_UIOUTPUT = "javax.faces.component.UIOutput";
- /**
- * Base class name for UICommand's
- */
- public final static String BASE_CLASS_UICOMMAND = "javax.faces.component.UICommand";
- /**
- * Base class name for UIData's
- */
- public final static String BASE_CLASS_UIDATA = "javax.faces.component.UIData";
- /**
- * Base class name for UIForm's
- */
- public final static String BASE_CLASS_UIFORM = "javax.faces.component.UIForm";
-
- /**
- * Interface name for ValueHolder's
- */
- public final static String INTERFACE_VALUEHOLDER = "javax.faces.component.ValueHolder";
- /**
- * Interface name for EditableValueHolder's
- */
- public final static String INTERFACE_EDITABLEVALUEHOLDER = "javax.faces.component.EditableValueHolder";
- /**
- * Interface name for ActionSource's
- */
- public final static String INTERFACE_ACTIONSOURCE = "javax.faces.component.ActionSource";
- /**
- * Interface name for ActionSource2's
- */
- public final static String INTERFACE_ACTIONSOURCE2 = "javax.faces.component.ActionSource2";
- /**
- * Interface name for NamingContainer's
- */
- public final static String INTERFACE_NAMINGCONTAINER = "javax.faces.component.NamingContainer";
-
- /**
- * @param id
- * @param parent
- * @param typeInfo
- * @param isRendered
- * @return a new component info
- */
- public static ComponentInfo createComponentInfo(final String id,
- final ComponentInfo parent, final ComponentTypeInfo typeInfo,
- final boolean isRendered)
- {
- return new ComponentInfo(id, parent, typeInfo, isRendered);
- }
-
- /**
- * If the rendered attribute isn't set, defaults it.
- *
- * @param attributes
- */
- public static void maybeDefaultRendered(final Map attributes)
- {
- if (!(attributes.get("rendered") instanceof Boolean))
- {
- attributes.put("rendered", Boolean.TRUE);
- }
- }
-
- /**
- * @param parent
- * @param componentTypeInfo
- * @param attributes
- * @return a new component info
- */
- public static ComponentInfo createComponentInfo(final ComponentInfo parent,
- final ComponentTypeInfo componentTypeInfo, final Map attributes)
- {
- maybeDefaultRendered(attributes);
- return new ComponentInfo(parent, componentTypeInfo, attributes);
- }
-
- /**
- * @param id
- * @param parent
- * @param typeInfo
- * @param editableValueHolder
- * @param isRendered
- * @return a new UIInputInfo
- */
- public static UIInputInfo createUIInputInfo(final String id,
- final ComponentInfo parent, final ComponentTypeInfo typeInfo,
- final IEditableValueHolderInfo editableValueHolder,
- final boolean isRendered)
- {
- return new UIInputInfo(id, parent, typeInfo, editableValueHolder,
- isRendered);
- }
-
- /**
- * @param parent
- * @param typeInfo
- * @param attributes
- * @return a new UIInputInfo
- */
- public static UIInputInfo createUIInputInfo(final ComponentInfo parent,
- final ComponentTypeInfo typeInfo, final Map attributes)
- {
- maybeDefaultRendered(attributes);
- return new UIInputInfo(parent, typeInfo, attributes);
- }
-
- /**
- * @param id
- * @param parent
- * @param typeInfo
- * @param valueHolderInfo
- * @param isRendered
- * @return a new UIOutputInfo
- */
- public static UIOutputInfo createUIOutputInfo(final String id,
- final ComponentInfo parent, final ComponentTypeInfo typeInfo,
- final IValueHolderInfo valueHolderInfo, final boolean isRendered)
- {
- return new UIOutputInfo(id, parent, typeInfo, valueHolderInfo,
- isRendered);
- }
-
- /**
- * @param parent
- * @param typeInfo
- * @param attributes
- * @return a new UIOutputInfo
- */
- public static UIOutputInfo createUIOutputInfo(final ComponentInfo parent,
- final ComponentTypeInfo typeInfo, final Map attributes)
- {
- maybeDefaultRendered(attributes);
- return new UIOutputInfo(parent, typeInfo, attributes);
- }
-
- /**
- * @param id
- * @param parent
- * @param typeInfo
- * @param actionSourceInfo
- * @param isRendered
- * @return a new UICommandInfo
- */
- public static UICommandInfo createUICommandInfo(final String id,
- final ComponentInfo parent, final ComponentTypeInfo typeInfo,
- final IActionSourceInfo actionSourceInfo, final boolean isRendered)
- {
- return new UICommandInfo(id, parent, typeInfo, isRendered,
- actionSourceInfo);
- }
-
- /**
- * @param parent
- * @param typeInfo
- * @param attributes
- * @return a new UICommandInfo
- */
- public static UICommandInfo createUICommandInfo(final ComponentInfo parent,
- final ComponentTypeInfo typeInfo, final Map attributes)
- {
- maybeDefaultRendered(attributes);
- return new UICommandInfo(parent, typeInfo, attributes);
- }
-
- /**
- * @param id
- * @param parent
- * @param typeInfo
- * @param isRendered
- * @param prependId
- * @param submitted
- * @return a new UIFormInfo
- */
- public static UIFormInfo createUIFormInfo(final String id,
- final ComponentInfo parent, final ComponentTypeInfo typeInfo,
- final boolean isRendered, final boolean prependId,
- final boolean submitted)
- {
- return new UIFormInfo(id, parent, typeInfo, isRendered, prependId,
- submitted);
- }
-
- /**
- * @param parent
- * @param typeInfo
- * @param attributes
- * @return a new UIFormInfo
- */
- public static UIFormInfo createUIFormInfo(final ComponentInfo parent,
- final ComponentTypeInfo typeInfo, final Map attributes)
- {
- maybeDefaultRendered(attributes);
- maybeDefaultPrependId(attributes);
- maybeDefaultSubmitted(attributes);
- return new UIFormInfo(parent, typeInfo, attributes);
- }
-
- private static void maybeDefaultSubmitted(Map attributes)
- {
- if (!(attributes.get("submitted") instanceof Boolean))
- {
- attributes.put("submitted", Boolean.FALSE);
- }
- }
-
- private static void maybeDefaultPrependId(Map attributes)
- {
- if (!(attributes.get("prependId") instanceof Boolean))
- {
- attributes.put("prependId", Boolean.FALSE);
- }
- }
-
- /**
- * @param id
- * @param parent
- * @param typeInfo
- * @param isRendered
- * @param dataModel
- * @param first
- * @param footer
- * @param header
- * @param rowCount
- * @param rowAvailable
- * @param rowData
- * @param rowIndex
- * @param rows
- * @param value
- * @param var
- * @return a new UIDataInfo
- */
- public static UIDataInfo createUIDataInfo(final String id,
- final ComponentInfo parent, final ComponentTypeInfo typeInfo,
- final boolean isRendered, final DataModelInfo dataModel,
- final int first, final ComponentInfo footer,
- final ComponentInfo header, final int rowCount,
- final boolean rowAvailable, final Object rowData,
- final int rowIndex, final int rows, final Object value,
- final String var)
- {
- return new UIDataInfo(id, parent, typeInfo, isRendered, dataModel,
- first, footer, header, rowCount, rowAvailable, rowData,
- rowIndex, rows, value, var);
- }
-
- /**
- * @param parent
- * @param typeInfo
- * @param attributes
- * @return the UIDataInfo
- */
- public static UIDataInfo createUIDataInfo(final ComponentInfo parent,
- final ComponentTypeInfo typeInfo, final Map attributes)
- {
- maybeDefaultRendered(attributes);
- maybeDefaultFirst(attributes);
- maybeDefaultRowCount(attributes);
- maybeDefaultRowAvailable(attributes);
- maybeDefaultRowIndex(attributes);
- maybeDefaultRows(attributes);
- maybeDefaultVar(attributes);
- return new UIDataInfo(parent, typeInfo, attributes);
- }
-
-
- private static final Integer ZERO = new Integer(0);
- private static final Integer MINUS_ONE = new Integer(-1);
-
- private static void maybeDefaultFirst(Map attributes)
- {
- if (!(attributes.get("first") instanceof Integer))
- {
- attributes.put("first", ZERO);
- }
- }
-
- private static void maybeDefaultRowCount(Map attributes)
- {
- if (!(attributes.get("rowCount") instanceof Integer))
- {
- attributes.put("rowCount", MINUS_ONE);
- }
- }
-
- private static void maybeDefaultRowAvailable(Map attributes)
- {
- if (! (attributes.get("rowAvailable") instanceof Boolean))
- {
- attributes.put("rowAvailable", Boolean.FALSE);
- }
- }
-
- private static void maybeDefaultRowIndex(Map attributes)
- {
- if (! (attributes.get("rowIndex") instanceof Integer))
- {
- attributes.put("rowIndex", MINUS_ONE);
- }
- }
-
- private static void maybeDefaultRows(Map attributes)
- {
- if (! (attributes.get("rows") instanceof Integer))
- {
- attributes.put("rows", ZERO);
- }
- }
-
- private static void maybeDefaultVar(Map attributes)
- {
- if (! (attributes.get("var") instanceof String))
- {
- attributes.put("var", "** default variable **");
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/ComponentInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/ComponentInfo.java
deleted file mode 100644
index 907167c..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/ComponentInfo.java
+++ /dev/null
@@ -1,734 +0,0 @@
-package org.eclipse.jst.jsf.common.runtime.internal.model.component;
-
-import java.beans.BeanInfo;
-import java.beans.IntrospectionException;
-import java.beans.Introspector;
-import java.beans.PropertyDescriptor;
-import java.io.Serializable;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.Map.Entry;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.ViewObject;
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.FacetDecorator;
-
-/**
- * Models a basic UI component instance
- *
- * TODO: should implement a visitor pattern to traverse component trees
- *
- * @author cbateman
- *
- */
-public class ComponentInfo extends ViewObject implements Serializable
-{
- /**
- * serializable id
- */
- private static final long serialVersionUID = 2517204356825585699L;
-
- private final static int DEFAULT_ARRAY_SIZE = 4;
-
- /**
- * the component id
- */
- protected final String _id;
- /**
- * the component's parent or null if none
- */
- protected final ComponentInfo _parent;
- /**
- * the type info for this component
- */
- protected final ComponentTypeInfo _componentTypeInfo;
- /**
- * the rendered flage
- */
- protected final boolean _isRendered;
-
- private transient BeanPropertyManager _beanPropertyManager = new BeanPropertyManager(
- this);
-
- // initialized
- // by
- // getBeanProperties
-
- /**
- * @param id
- * @param parent
- * @param componentTypeInfo
- * @param isRendered
- */
- protected ComponentInfo(final String id, final ComponentInfo parent,
- final ComponentTypeInfo componentTypeInfo, final boolean isRendered)
- {
- _id = translateForNull(id);
- _parent = parent;
- _componentTypeInfo = componentTypeInfo;
- _isRendered = isRendered;
- }
-
- /**
- * Construct a new component info using the attributes keyed by name in
- * attributes to set values. The names must match the corresponding bean
- * property names. Primitives should be wrapped in their corresponding
- * object types. Exceptions will be thrown if there is a type mismatch on an
- * expected type. Number will be used for all numeric primitive wrappers an
- * the corresponding "to" will be called.
- *
- * @param parent
- * @param componentTypeInfo
- * @param attributes
- * @throws ClassCastException
- * if an attribute's value doesn't match the expected type
- * @throws NullPointerException
- * if an attribute value is null for a value whose type is
- * expected to be primitive
- * @throws IllegalArgumentException
- * if attributes does not contain a required key.
- */
- protected ComponentInfo(final ComponentInfo parent,
- final ComponentTypeInfo componentTypeInfo, final Map attributes)
- {
- this(getStringProperty("id", attributes, false), parent,
- componentTypeInfo, getBooleanProperty("rendered", attributes));
- }
-
- /**
- * @param key
- * @param attributes
- * @param mandatory
- * @return the value in attributes at location key, forcing a
- * ClassCastException if it turns out not to be a String.
- * @throws ClassCastException
- * if the attribute for key is not a String
- * @throws IllegalArgumentException
- * if the attribute for key is null but mandatory is true.
- */
- protected static String getStringProperty(final String key,
- final Map attributes, final boolean mandatory)
- {
- final Object value = attributes.get(key);
-
- if (mandatory && value == null)
- {
- throw new IllegalArgumentException(key
- + " is a mandatory attribute");
- }
- return (String) value;
- }
-
- /**
- * @param key
- * @param attributes
- *
- * @return the value in attributes at location, forcing a ClassCastExceptio
- * if it is no a Boolean.
- * @throws IllegalArgumentException
- * if key is not found (all boolean attributes are mandatory
- * since there is no valid state for unset.
- */
- protected static boolean getBooleanProperty(final String key,
- final Map attributes)
- {
- final Boolean value = (Boolean) attributes.get(key);
-
- if (value == null)
- {
- throw new IllegalArgumentException(key + "is mandatory");
- }
-
- return value.booleanValue();
- }
-
- /**
- * @param key
- * @param attributes
- * @return the integer property for key. Casts the value to Number and calls
- * Number.intValue().
- */
- protected static int getIntegerProperty(final String key,
- final Map attributes)
- {
- final Number value = (Number) attributes.get(key);
-
- if (value == null)
- {
- throw new IllegalArgumentException(key + " is mandatory");
- }
-
- return value.intValue();
- }
-
- /**
- * @param key
- * @param attributes
- * @return the component info value from attributes
- */
- protected static ComponentInfo getComponentProperty(final String key,
- final Map attributes)
- {
- return (ComponentInfo) attributes.get(key);
- }
-
- private String translateForNull(final String arg)
- {
-
- if (arg == null || "!".equals(arg.trim()))
- {
- return null;
- }
- return arg.trim();
- }
-
- private List/* <ComponentInfo> */_children;
-
- /**
- * @return the id
- */
- public final String getId()
- {
- return _id;
- }
-
- /**
- * @return the component type info
- */
- public final ComponentTypeInfo getComponentTypeInfo()
- {
- return _componentTypeInfo;
- }
-
- /**
- * @return the children. List is unmodifiable. List contains all children
- * including facets.
- */
- public final synchronized List/* <ComponentInfo> */getChildren()
- {
- if (_children == null)
- {
- return Collections.EMPTY_LIST;
- }
- return Collections.unmodifiableList(_children);
- }
-
- /**
- * Get the sub-set of {@link #getChildren()} that are facets. This is a
- * convenience method for {@link #getDecorators(Class)}
- *
- * @return all component children that are facets
- */
- public final List getFacets()
- {
- return getDecorators(ComponentFactory.FACET);
- }
-
- /**
- * @param childComponent
- */
- public final synchronized void addChild(final ComponentInfo childComponent)
- {
- if (_children == null)
- {
- _children = new ArrayList(DEFAULT_ARRAY_SIZE);
- }
- _children.add(childComponent);
- }
-
- /**
- * @param name
- * @param facetComponent
- */
- public final synchronized void addFacet(final String name,
- final ComponentInfo facetComponent)
- {
- addChild(facetComponent);
- addDecorator(new FacetDecorator(name, facetComponent));
- }
-
- /**
- * @param component
- * @return if component corresponds to a facet of this component, returns
- * the name of that facet. Returns null if not found.
- */
- public final String getFacetName(final ComponentInfo component)
- {
- if (component == null)
- {
- return null;
- }
-
- final List facets = getDecorators(ComponentFactory.FACET);
-
- for (final Iterator it = facets.iterator(); it.hasNext();)
- {
- final FacetDecorator facet = (FacetDecorator) it.next();
- if (component == facet.getDecorates())
- {
- return facet.getName();
- }
- }
-
- // component is not a facet
- return null;
- }
-
- /**
- * @param name
- * @return if this has a facet called name, then returns it's single root
- * component.
- */
- public final synchronized ComponentInfo getFacet(final String name)
- {
- if (name == null)
- {
- return null;
- }
-
- final List facets = getDecorators(ComponentFactory.FACET);
-
- for (final Iterator it = facets.iterator(); it.hasNext();)
- {
- final FacetDecorator facet = (FacetDecorator) it.next();
- if (name.equals(facet.getName()))
- {
- return facet.getDecorates();
- }
- }
-
- // not found
- return null;
- }
-
- public String toString()
- {
- final String parentId = _parent != null ? _parent.getId() : "null";
- String toString = getMostSpecificComponentName() + ": id=" + _id
- + ", parentId: " + parentId + ", family="
- + _componentTypeInfo.getComponentFamily() + ", render="
- + _componentTypeInfo.getRenderFamily() + ", rendered="
- + _isRendered;
-
- // use bean introspection to dump child properties
- if (this.getClass() != ComponentInfo.class)
- {
- toString += dumpProperties();
- }
-
- return toString;
- }
-
- private String dumpProperties()
- {
- String properties = "";
- try
- {
- final BeanInfo beanInfo = Introspector.getBeanInfo(this.getClass(),
- ComponentInfo.class);
-
- final PropertyDescriptor[] descriptors = beanInfo
- .getPropertyDescriptors();
- for (int i = 0; i < descriptors.length; i++)
- {
- final PropertyDescriptor desc = descriptors[i];
- final String name = desc.getName();
- final Object valueObj = desc.getValue(name);
- final String value = valueObj != null ? valueObj.toString()
- : "null";
- properties += ", " + name + "=" + value;
- }
- }
- catch (final IntrospectionException e)
- {
- return "Error introspecting bean: " + e.getLocalizedMessage();
- }
-
- return properties;
- }
-
- /**
- * @return used for toString. Clients should not use.
- */
- protected String getMostSpecificComponentName()
- {
- return "UIComponent";
- }
-
- /**
- * @return the parent of this component or null.
- */
- public final ComponentInfo getParent()
- {
- return _parent;
- }
-
- /**
- * @return the rendered flag
- */
- public final boolean isRendered()
- {
- return _isRendered;
- }
-
- public synchronized void addAdapter(final Class adapterType,
- final Object adapter)
- {
- super.addAdapter(adapterType, adapter);
-
- // force an update on the next call to getBeanProperties
- _beanPropertyManager.reset();
- }
-
- public synchronized Object removeAdapter(final Class adapterType)
- {
- final Object removed = super.removeAdapter(adapterType);
-
- _beanPropertyManager.reset();
-
- return removed;
- }
-
- /**
- * @return the set of all bean property names for this component. The set is
- * unmodifiable and will throw exceptions if modification is
- * attempted.
- */
- protected final Map/* <String, ComponentBeanProperty> */getBeanProperties()
- {
- return Collections.unmodifiableMap(_beanPropertyManager
- .getBeanProperties());
- }
-
- /**
- * This is similar to the runtime getAttributes().get(name) call. The reason
- * we don't implement a Map of all attribute values is that the implicit
- * property structure can change at any time due to add/removeAdapter. To
- * get all attributes known for a component, instead use:
- *
- * The synchronized block is advised to protect against concurrent
- * modification exceptions on the keySet iterator.
- *
- * @param name
- *
- * @return the value of the attribute or null if none.
- *
- */
- public synchronized ComponentBeanProperty getAttribute(final String name)
- {
- return (ComponentBeanProperty) getBeanProperties().get(name);
- }
-
- /**
- * @return the set of valid attribute names. The Set is not modifiable.
- */
- public synchronized Set/*<String>*/ getAttributeNames()
- {
- return getBeanProperties().keySet();
- }
- /**
- * Stores a bean property descriptor along information about which
- * implementation class declares it and what key to pass to getAdapter() in
- * order to get it.
- *
- */
- public final static class ComponentBeanProperty
- {
- private final PropertyDescriptor _propertyDescriptor;
- private final Object _declaringImplementation;
- private final Class _adapterKeyClass;
-
- // only instantiable locally
- private ComponentBeanProperty(Class adapterKeyClass,
- Object declaringImplementationClass,
- PropertyDescriptor propertyDescriptor)
- {
- super();
- _adapterKeyClass = adapterKeyClass;
- _declaringImplementation = declaringImplementationClass;
- _propertyDescriptor = propertyDescriptor;
- }
-
- /**
- * @return the value of property
- */
- public final Object getValue()
- {
- final Method method = _propertyDescriptor.getReadMethod();
- if (method != null)
- {
- try
- {
- method.setAccessible(true);
- return method.invoke(_declaringImplementation,
- new Object[0]);
- }
- catch (IllegalArgumentException e)
- {
- e.printStackTrace();
- }
- catch (IllegalAccessException e)
- {
- e.printStackTrace();
- }
- catch (InvocationTargetException e)
- {
- e.printStackTrace();
- }
- }
- // if any step fails, return null
- return null;
- }
-
- /**
- * @return the property descriptor
- */
- public final PropertyDescriptor getPropertyDescriptor()
- {
- return _propertyDescriptor;
- }
-
- /**
- * @return the implemenation
- */
- public final Object getDeclaringImplementationClass()
- {
- return _declaringImplementation;
- }
-
- /**
- * @return the adapter class for the interface that the declaring
- * implementation is providing the impl for
- */
- public final Class getAdapterKeyClass()
- {
- return _adapterKeyClass;
- }
- }
-
- /**
- * Manages bean property information for a component
- *
- * @author cbateman
- *
- */
- protected final static class BeanPropertyManager
- {
- /**
- * a map of the bean property names exposed by this component including
- * all those added by addAdapter().
- *
- * this is synthetic based the class definition and installed adapters
- * so as long that info is available, no need to serialize.
- */
- protected transient Map/* <String, ComponentBeanProperty> */_beanProperties; // lazily
- private final transient ComponentInfo _component;
-
- /**
- * @param component
- */
- protected BeanPropertyManager(final ComponentInfo component)
- {
- _component = component;
- }
-
- /**
- * Will throw exception of the calling thread already holds the "this"
- * monitor lock. This is to ensure that caller always acquires locks in
- * appropriate order to prevent deadlock.
- *
- * @return the internal set of bean properties. This Set may be modified
- * internally.
- */
- public Map getBeanProperties()
- {
- if (Thread.holdsLock(this))
- {
- throw new IllegalStateException(
- "Must not already own this lock");
- }
-
- // must always acquire component lock first to prevent deadlock
- synchronized (_component)
- {
- synchronized (this)
- {
- if (_beanProperties == null)
- {
- _beanProperties = calculateAllBeanPropNames(ViewObject.class);
- }
-
- return _beanProperties;
- }
- }
- }
-
- /**
- * Will throw exception if the calling thread already holds the "this"
- * monitor lock. This is to ensure that caller always acquires locks in
- * appropriate order to prevent deadlock.
- *
- * Clears the internal map and sets to null. This will force it to be
- * completely new built on the next call to getBeanProperties
- */
- public void reset()
- {
- if (Thread.holdsLock(this))
- {
- throw new IllegalStateException(
- "Must not already own this lock");
- }
-
- // must always acquire component lock first to prevent deadlock
- synchronized (_component)
- {
- synchronized (this)
- {
- if (_beanProperties != null)
- {
- _beanProperties.clear();
- _beanProperties = null;
- }
- }
- }
- }
-
- /**
- * @param stopClass
- * @return a synchronized map of all bean property names on this class
- * up to stopClass, as well as all adapter property names (as
- * though this really implemented them).
- */
- private Map calculateAllBeanPropNames(final Class stopClass)
- {
- // use a set to prevents the duplicates
- final Map allProperties = new HashMap();
-
- {
- final Class myClass = _component.getClass();
- final List myProperties = getOrCreateBeanProperties(myClass,
- stopClass);
-
- addToMap(myProperties, _component, myClass, allProperties);
- }
-
- {
- for (final Iterator it = _component.getAdapterMap().entrySet()
- .iterator(); it.hasNext();)
- {
- Map.Entry entry = (Entry) it.next();
-
- final Class adapterClass = (Class) entry.getKey();
- final Object declaringClass = entry.getValue();
- // get all props, excluding the ones on Object.
- final List props = getOrCreateBeanProperties(adapterClass,
- null);
- addToMap(props, declaringClass, adapterClass, allProperties);
- }
- }
-
- return Collections.synchronizedMap(allProperties);
- }
-
- private static void addToMap(
- final List/* <ComponentBeanProperty> */addThese,
- final Object declaringObject, final Class declaringAdapter,
- final Map toMe)
- {
- for (final Iterator it = addThese.iterator(); it.hasNext();)
- {
- final PropertyDescriptor desc = (PropertyDescriptor) it.next();
-
- if (!toMe.containsKey(desc.getName()))
- {
- toMe.put(desc.getName(), new ComponentBeanProperty(
- declaringAdapter, declaringObject, desc));
- }
- else
- {
- // TODO: need logging
- System.err
- .println("Name collision in properties. Trying to add ["
- + desc.toString()
- + " when already have "
- + toMe.get(desc.getName()));
- }
- }
- }
-
- /**
- * lazily loaded with the local properties (those not defined using
- * adapters)
- *
- * MUST INITIALIZE early so can synchronize on it
- */
- private transient static Map/* <Class, List<PropertyDescriptor> */PROPERTY_MAP = new HashMap();
-
- /**
- * @param startClass
- * @param stopClass
- * @return a unmodifiable list of properties starting from startClass.
- * stopClass is only used if an entry doesn't already exist in
- * PROPERTY_MAP for startClass. The method is synchronized on
- * the PROPERTY_MAP it updates.
- */
- protected static List/* <PropertyDescriptor */getOrCreateBeanProperties(
- final Class startClass, final Class stopClass)
- {
- synchronized (PROPERTY_MAP)
- {
- List localBeanProps = (List) PROPERTY_MAP.get(startClass);
-
- if (localBeanProps == null)
- {
- localBeanProps = calculateBeanProperties(startClass,
- stopClass);
- PROPERTY_MAP.put(startClass, Collections
- .unmodifiableList(localBeanProps));
- }
-
- return localBeanProps;
- }
- }
-
- /**
- * @param startClass
- * @param stopClass
- * @return a List<String> containing all of the bean names between
- * startClass and stopClass. Start class must be a descendant
- * (sub-class, sub-sub-class etc.) of stopClass. The properties
- * on stopClass are excluded from analysis.
- */
- private static List/* <PropertyDescriptor> */calculateBeanProperties(
- final Class startClass, final Class stopClass)
- {
- BeanInfo beanInfo;
- List names = new ArrayList();
-
- try
- {
- beanInfo = Introspector.getBeanInfo(startClass, stopClass);
- final PropertyDescriptor[] descriptors = beanInfo
- .getPropertyDescriptors();
-
- if (descriptors != null)
- {
- names = Arrays.asList(descriptors);
- }
- }
- catch (final IntrospectionException e)
- {
- e.printStackTrace();
- }
- return names;
- }
-
- }
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/ComponentTypeInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/ComponentTypeInfo.java
deleted file mode 100644
index a50c421..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/ComponentTypeInfo.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package org.eclipse.jst.jsf.common.runtime.internal.model.component;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.types.ClassTypeInfo;
-
-/**
- * Type information about a UIComponent
- *
- * @author cbateman
- *
- */
-public class ComponentTypeInfo extends ClassTypeInfo
-{
- /**
- * serializable uid
- */
- private static final long serialVersionUID = -311156682935177206L;
- /**
- * the ComponentType (see JSF spec for definition)
- */
- protected final String _componentType; // may be null, since may not be
- // known at runtime
- /**
- * the component family (see JSF spec)
- */
- protected final String _componentFamily;
- /**
- * the render family (see JSF spec)
- */
- protected final String _renderFamily;
-
- /**
- * @param componentType
- * @param componentClass
- * @param componentFamily
- * @param renderFamily
- */
- public ComponentTypeInfo(final String componentType,
- final String componentClass, final String componentFamily,
- final String renderFamily)
- {
- super(componentClass, new String[0], new String[0]);
- _componentType = componentType;
- _componentFamily = componentFamily;
- _renderFamily = renderFamily;
- }
-
- /**
- * @param componentType
- * @param superClasses
- * @param interfaces
- * @param componentClass
- * @param componentFamily
- * @param renderFamily
- */
- public ComponentTypeInfo(final String componentType,
- final String componentClass,
- final String[] superClasses, final String[] interfaces,
- final String componentFamily,
- final String renderFamily)
- {
- super(componentClass, superClasses, interfaces);
- _componentType = componentType;
- _componentFamily = componentFamily;
- _renderFamily = renderFamily;
- }
-
- /**
- * @return the component type or null if unknown (may not be at runtime)
- */
- public final String getComponentType()
- {
- return _componentType;
- }
-
- /**
- * @return the component family
- */
- public final String getComponentFamily()
- {
- return _componentFamily;
- }
-
- /**
- * @return the render family
- */
- public final String getRenderFamily()
- {
- return _renderFamily;
- }
-
- public String toString()
- {
- return "Component Type Info: type = " + _componentType + " family=" + _componentFamily
- + " renderer=" + _renderFamily + ", "+super.toString();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UICommandInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UICommandInfo.java
deleted file mode 100644
index 38fe0b6..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UICommandInfo.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package org.eclipse.jst.jsf.common.runtime.internal.model.component;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.behavioural.IActionSource2Info;
-import org.eclipse.jst.jsf.common.runtime.internal.model.behavioural.IActionSourceInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ActionListenerDecorator;
-
-/**
- * An design time analog of the standard UICommand.
- * @author cbateman
- *
- */
-public class UICommandInfo extends ComponentInfo implements IActionSource2Info {
- private final String _actionExpression;
- private final String _actionListener;
- private final boolean _isImmediate;
-
- /**
- * serialization id
- */
- private static final long serialVersionUID = -9025172832535840949L;
-
- /**
- * @param id
- * @param parent
- * @param componentTypeInfo
- * @param isRendered
- * @param actionSourceInfo
- */
- protected UICommandInfo(final String id, final ComponentInfo parent,
- final ComponentTypeInfo componentTypeInfo,
- final boolean isRendered, final IActionSourceInfo actionSourceInfo) {
- super(id, parent, componentTypeInfo, isRendered);
-
- if (actionSourceInfo == null) {
- _actionExpression = null;
- _actionListener = null;
- _isImmediate = false;
- } else {
- // TODO: having action and actionExpression will come back to
- // to bite us.
- _actionExpression = actionSourceInfo.getAction();
- _actionListener = actionSourceInfo.getActionListener();
- _isImmediate = actionSourceInfo.isImmediate();
-
- for (final Iterator it = actionSourceInfo.getActionListeners()
- .iterator(); it.hasNext();) {
- final ActionListenerDecorator actionListener =
- (ActionListenerDecorator) it.next();
- addActionListener(actionListener);
- }
- }
- }
-
- /**
- * @param parent
- * @param componentTypeInfo
- * @param attributes
- */
- protected UICommandInfo(final ComponentInfo parent, final ComponentTypeInfo componentTypeInfo,
- Map attributes)
- {
- this(getStringProperty("id", attributes, true),
- parent, componentTypeInfo,
- getBooleanProperty("rendered", attributes),
- getActionSourceInfo("$actionSourceInfo", attributes)
- );
- }
-
- private static IActionSourceInfo getActionSourceInfo(String key,
- Map attributes)
- {
- return (IActionSourceInfo) attributes.get(key);
- }
-
- public String getActionExpression() {
- return _actionExpression;
- }
-
- public final void addActionListener(final ActionListenerDecorator actionListener) {
- addDecorator(actionListener, ComponentFactory.ACTION_LISTENER);
- }
-
- public final String getAction() {
- return _actionExpression;
- }
-
- public final String getActionListener() {
- return _actionListener;
- }
-
- public final List getActionListeners() {
- return getDecorators(ComponentFactory.ACTION_LISTENER);
- }
-
- public final boolean isImmediate() {
- return _isImmediate;
- }
-
- protected String getMostSpecificComponentName()
- {
- return "UICommand";
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UIDataInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UIDataInfo.java
deleted file mode 100644
index 76be08c..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UIDataInfo.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package org.eclipse.jst.jsf.common.runtime.internal.model.component;
-
-import java.util.Map;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.bean.DataModelInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.bean.SerializableObject;
-import org.eclipse.jst.jsf.common.runtime.internal.model.behavioural.INamingContainerInfo;
-
-/**
- * Design time analog to UIData.
- *
- * @author cbateman
- *
- */
-public class UIDataInfo extends ComponentInfo implements INamingContainerInfo
-{
- /**
- * the standard name for the footer facet
- */
- public final static String FACET_NAME_FOOTER = "footer";
- /**
- * the standard name for the header facet.
- */
- public final static String FACET_NAME_HEADER = "header";
- /**
- * serialization id
- */
- private static final long serialVersionUID = 3473288390914978784L;
-
- private final DataModelInfo _dataModel;
- private final int _first;
- private final int _rowCount;
- private final boolean _rowAvailable;
- private final SerializableObject _rowData;
- private final int _rowIndex;
- private final int _rows;
- private final SerializableObject _value;
- private final String _var;
-
- /**
- * @param id
- * @param parent
- * @param componentTypeInfo
- * @param isRendered
- * @param dataModel
- * @param first
- * @param footer
- * @param header
- * @param rowCount
- * @param rowAvailable
- * @param rowData
- * @param rowIndex
- * @param rows
- * @param value
- * @param var
- */
- public UIDataInfo(final String id, final ComponentInfo parent,
- final ComponentTypeInfo componentTypeInfo,
- final boolean isRendered, final DataModelInfo dataModel,
- final int first, final ComponentInfo footer,
- final ComponentInfo header, final int rowCount,
- final boolean rowAvailable, final Object rowData,
- final int rowIndex, final int rows, final Object value,
- final String var)
- {
- super(id, parent, componentTypeInfo, isRendered);
- _dataModel = dataModel;
- _first = first;
- _rowCount = rowCount;
- _rowAvailable = rowAvailable;
- _rowData = new SerializableObject(rowData);
- _rowIndex = rowIndex;
- _rows = rows;
- _value = new SerializableObject(value);
- _var = var;
-
- if (footer != null)
- {
- addFacet(FACET_NAME_FOOTER, footer);
- }
-
- if (header != null)
- {
- addFacet(FACET_NAME_HEADER, header);
- }
- }
-
- /**
- * @param parent
- * @param componentTypeInfo
- * @param attributes
- */
- public UIDataInfo(final ComponentInfo parent,
- final ComponentTypeInfo componentTypeInfo, Map attributes)
- {
- this(getStringProperty("id", attributes, true), parent,
- componentTypeInfo,
- getBooleanProperty("rendered", attributes),
- getDataModelInfo("$dataModel", attributes),
- getIntegerProperty("first", attributes),
- getComponentProperty("footer", attributes),
- getComponentProperty("header", attributes),
- getIntegerProperty("rowCount", attributes),
- getBooleanProperty("rowAvailable", attributes),
- attributes.get("rowData"),
- getIntegerProperty("rowIndex", attributes),
- getIntegerProperty("rows", attributes),
- attributes.get("value"),
- getStringProperty("var", attributes, true));
- }
-
- private static DataModelInfo getDataModelInfo(String key, Map attributes)
- {
- return (DataModelInfo) attributes.get(key);
- }
-
- /**
- * @return the data model
- */
- public final DataModelInfo getDataModel()
- {
- return _dataModel;
- }
-
- /**
- * @return the first row
- */
- public final int getFirst()
- {
- return _first;
- }
-
- /**
- * @return the row count
- */
- public final int getRowCount()
- {
- return _rowCount;
- }
-
- /**
- * @return true if the row is available
- */
- public final boolean isRowAvailable()
- {
- return _rowAvailable;
- }
-
- /**
- * @return the row data (may be null if not serialiable)
- */
- public final Object getRowData()
- {
- return _rowData.getMaybeSerializable();
- }
-
- /**
- * @return the row index
- */
- public final int getRowIndex()
- {
- return _rowIndex;
- }
-
- /**
- * @return the rows
- */
- public final int getRows()
- {
- return _rows;
- }
-
- /**
- * @return the value of the model (may be null if not serialiable)
- */
- public final Object getValue()
- {
- return _value.getMaybeSerializable();
- }
-
- /**
- * @return the name used to define the EL row variable
- */
- public final String getVar()
- {
- return _var;
- }
-
- /**
- * @return the header facet or null.
- */
- public final ComponentInfo getHeader()
- {
- return getFacet(FACET_NAME_HEADER);
- }
-
- /**
- * @return the footer facet or null.
- */
- public final ComponentInfo getFooter()
- {
- return getFacet(FACET_NAME_FOOTER);
- }
-
- protected String getMostSpecificComponentName()
- {
- return "UIData";
- }
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UIFormInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UIFormInfo.java
deleted file mode 100644
index 5f0d7c4..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UIFormInfo.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package org.eclipse.jst.jsf.common.runtime.internal.model.component;
-
-import java.util.Map;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.behavioural.INamingContainerInfo;
-
-/**
- * A design-time analog for the UIForm.
- *
- * @author cbateman
- */
-public class UIFormInfo extends ComponentInfo implements INamingContainerInfo
-{
- /**
- * serializable id
- */
- private static final long serialVersionUID = 6961034911873576644L;
-
- private final boolean _prependId;
- private final boolean _submitted;
-
- /**
- * @param id
- * @param parent
- * @param componentTypeInfo
- * @param isRendered
- * @param prependId
- * @param submitted
- */
- protected UIFormInfo(final String id, final ComponentInfo parent,
- final ComponentTypeInfo componentTypeInfo, final boolean isRendered
- , final boolean prependId, final boolean submitted) {
- super(id, parent, componentTypeInfo, isRendered);
- _prependId = prependId;
- _submitted = submitted;
- }
-
- /**
- * @param parent
- * @param componentTypeInfo
- * @param attributes
- */
- protected UIFormInfo(final ComponentInfo parent, ComponentTypeInfo componentTypeInfo,
- Map attributes)
- {
- this(getStringProperty("id", attributes, true),
- parent,
- componentTypeInfo,
- getBooleanProperty("rendered", attributes),
- getBooleanProperty("prependId", attributes),
- getBooleanProperty("submitted", attributes));
- }
-
- /**
- * JSF 1.2 only
- *
- * @return true if the form allows its id to be prepended to its
- * descendent's ids.
- */
- public final boolean isPrependId()
- {
- return _prependId;
- }
-
- /**
- * @return true if the form is submitted.
- */
- public final boolean isSubmitted() {
- return _submitted;
- }
-
- protected String getMostSpecificComponentName()
- {
- return "UIForm";
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UIInputInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UIInputInfo.java
deleted file mode 100644
index f46a12a..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UIInputInfo.java
+++ /dev/null
@@ -1,172 +0,0 @@
-package org.eclipse.jst.jsf.common.runtime.internal.model.component;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.behavioural.IEditableValueHolderInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ValidatorDecorator;
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ValueChangeListenerDecorator;
-
-/**
- * A design-time analog of the standard UIInput.
- *
- * @author cbateman
- *
- */
-public class UIInputInfo extends UIOutputInfo implements
- IEditableValueHolderInfo
-{
- /**
- * serializable uid
- */
- private static final long serialVersionUID = -6055473902554910848L;
- private final boolean _isValid;
- private final boolean _isImmediate;
- private final boolean _isRequired;
- private final Object _submittedValue;
- private final String _validator;
- private final String _valueChangeListener;
- private final boolean _localSetValue;
-
- /**
- * @param id
- * @param parent
- * @param typeInfo
- * @param editableValueHolderInfo
- * @param isRendered
- */
- protected UIInputInfo(final String id, final ComponentInfo parent,
- final ComponentTypeInfo typeInfo,
- final IEditableValueHolderInfo editableValueHolderInfo,
- final boolean isRendered)
- {
- super(id, parent, typeInfo, editableValueHolderInfo, isRendered);
-
- if (editableValueHolderInfo == null)
- {
- _isValid = true;
- _isImmediate = false;
- _isRequired = false;
- _localSetValue = false;
- _submittedValue = null;
- _validator = null;
- _valueChangeListener = null;
- }
- else
- {
- _isValid = editableValueHolderInfo.isValid();
- _isImmediate = editableValueHolderInfo.isImmediate();
- _isRequired = editableValueHolderInfo.isRequired();
- _localSetValue = editableValueHolderInfo.isLocalSetValue();
- _submittedValue = editableValueHolderInfo.getSubmittedValue();
- _validator = editableValueHolderInfo.getValidator();
- _valueChangeListener = editableValueHolderInfo
- .getValueChangeListener();
-
- for (final Iterator it = editableValueHolderInfo.getValidators()
- .iterator(); it.hasNext();)
- {
- final ValidatorDecorator validator = (ValidatorDecorator) it
- .next();
- addValidator(validator);
- }
-
- for (final Iterator it = editableValueHolderInfo
- .getValueChangeListeners().iterator(); it.hasNext();)
- {
- final ValueChangeListenerDecorator valueChangeListener = (ValueChangeListenerDecorator) it
- .next();
- addValueChangeListener(valueChangeListener);
- }
- }
- }
-
- /**
- * @param parent
- * @param typeInfo
- * @param attributes
- */
- protected UIInputInfo(final ComponentInfo parent,
- final ComponentTypeInfo typeInfo, Map attributes)
- {
- this(getStringProperty("id", attributes, true), parent, typeInfo,
- getEditableValueHolderInfo("$editableValueHolderInfo",
- attributes), getBooleanProperty("rendered", attributes));
- }
-
- private static IEditableValueHolderInfo getEditableValueHolderInfo(
- String key, Map attributes)
- {
- return (IEditableValueHolderInfo) attributes.get(key);
- }
-
- // public String toString() {
- // final String toString = super.toString();
- // return toString + ", isValid=" + _isValid + ", isImmediate="
- // + _isImmediate + ", isRequired=" + _isRequired;
- // }
-
- // @Override
- protected String getMostSpecificComponentName()
- {
- return "UIInput";
- }
-
- public final boolean isValid()
- {
- return _isValid;
- }
-
- public final boolean isImmediate()
- {
- return _isImmediate;
- }
-
- public final boolean isRequired()
- {
- return _isRequired;
- }
-
- public final Object getSubmittedValue()
- {
- return _submittedValue;
- }
-
- public final String getValidator()
- {
- return _validator;
- }
-
- public final String getValueChangeListener()
- {
- return _valueChangeListener;
- }
-
- public final boolean isLocalSetValue()
- {
- return _localSetValue;
- }
-
- public final void addValidator(final ValidatorDecorator validator)
- {
- addDecorator(validator, ComponentFactory.VALIDATOR);
- }
-
- public final void addValueChangeListener(
- final ValueChangeListenerDecorator valueChangeListenerInfo)
- {
- addDecorator(valueChangeListenerInfo,
- ComponentFactory.VALUE_CHANGE_LISTENER);
- }
-
- public final List getValidators()
- {
- return getDecorators(ComponentFactory.VALIDATOR);
- }
-
- public final List getValueChangeListeners()
- {
- return getDecorators(ComponentFactory.VALUE_CHANGE_LISTENER);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UIOutputInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UIOutputInfo.java
deleted file mode 100644
index 509f6e1..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UIOutputInfo.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package org.eclipse.jst.jsf.common.runtime.internal.model.component;
-
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.behavioural.IValueHolderInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ConverterDecorator;
-
-/**
- * A design-time analog for the UIOutput
- *
- * @author cbateman
- *
- */
-public class UIOutputInfo extends ComponentInfo implements IValueHolderInfo {
- /**
- * serializable uid
- */
- private static final long serialVersionUID = 9096297578991706150L;
-
- /**
- * the value
- */
- protected final Object _value;
- /**
- * the value before any EL evaluation
- */
- protected final Object _localValue;
-
- /**
- * @param id
- * @param parent
- * @param typeInfo
- * @param valueHolderInfo
- * @param isRendered
- */
- protected UIOutputInfo(final String id, final ComponentInfo parent,
- final ComponentTypeInfo typeInfo,
- final IValueHolderInfo valueHolderInfo, final boolean isRendered) {
- super(id, parent, typeInfo, isRendered);
-
- if (valueHolderInfo == null) {
- _value = null;
- _localValue = null;
- } else {
- _value = valueHolderInfo.getValue();
- _localValue = valueHolderInfo.getLocalValue();
-
- final ConverterDecorator converter = valueHolderInfo.getConverter();
- if (converter != null) {
- addDecorator(converter, ComponentFactory.CONVERTER);
- }
- }
- }
-
- /**
- * @param parent
- * @param typeInfo
- * @param attributes
- */
- protected UIOutputInfo(final ComponentInfo parent, final ComponentTypeInfo typeInfo,
- final Map attributes)
- {
- this(getStringProperty("id", attributes, true),
- parent,
- typeInfo,
- getValueHolderInfo("$valueHolderInfo", attributes),
- getBooleanProperty("rendered", attributes));
- }
-
- /**
- * @param key
- * @param attributes
- * @return the non-standard value holder info that encapsulates the
- * ValueHolder properties. This is never mandatory.
- */
- protected static IValueHolderInfo getValueHolderInfo(String key, Map attributes)
- {
- return (IValueHolderInfo) attributes.get(key);
- }
-
- // @Override
- protected String getMostSpecificComponentName() {
- return "UIOutput";
- }
-
- public final ConverterDecorator getConverter() {
- // should only be a single converter decorator...
- // so on this interface we'll return the first one if present.
- // to do things like error checking, use the getDecorator
- final List converters = getDecorators(ComponentFactory.CONVERTER);
-
- if (converters.size() > 0) {
- return (ConverterDecorator) converters.get(0);
- }
-
- return null;
- }
-
- public final Object getLocalValue() {
- return _localValue;
- }
-
- public final Object getValue() {
- return _value;
- }
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/datatypes/ELExpression.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/datatypes/ELExpression.java
deleted file mode 100644
index c5c7361..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/datatypes/ELExpression.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.eclipse.jst.jsf.common.runtime.internal.model.datatypes;
-
-/**
- * An abstraction for an EL expression.
- *
- * @author cbateman
- *
- */
-public abstract class ELExpression
-{
- /**
- * @return the original text of EL expression
- */
- public abstract String getText();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/ActionListenerDecorator.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/ActionListenerDecorator.java
deleted file mode 100644
index f092147..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/ActionListenerDecorator.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.eclipse.jst.jsf.common.runtime.internal.model.decorator;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.ComponentInfo;
-
-/**
- * Design time ActionListener decorator
- *
- * @author cbateman
- *
- */
-public class ActionListenerDecorator extends ComponentDecorator {
-
- /**
- *
- */
- private static final long serialVersionUID = 3806862878381550874L;
-
- /**
- * @param decorates
- */
- public ActionListenerDecorator(ComponentInfo decorates) {
- super(decorates);
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/ComponentDecorator.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/ComponentDecorator.java
deleted file mode 100644
index e37bf12..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/ComponentDecorator.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.eclipse.jst.jsf.common.runtime.internal.model.decorator;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.ComponentInfo;
-
-/**
- * @author cbateman
- *
- */
-public abstract class ComponentDecorator extends Decorator
-{
- /**
- *
- */
- private static final long serialVersionUID = 4378142984217256364L;
-
- private final ComponentInfo _decorates;
-
- /**
- * @param decorates
- */
- public ComponentDecorator(final ComponentInfo decorates)
- {
- _decorates = decorates;
- }
-
- /**
- * @return the component that this decorator decorates.
- */
- public final ComponentInfo getDecorates() {
- return _decorates;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/ConverterDecorator.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/ConverterDecorator.java
deleted file mode 100644
index 25046ba..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/ConverterDecorator.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.eclipse.jst.jsf.common.runtime.internal.model.decorator;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.ComponentInfo;
-
-/**
- * A converter decorator.
- *
- * @author cbateman
- *
- */
-public class ConverterDecorator extends ComponentDecorator {
-
- private final ConverterTypeInfo _typeInfo;
-
- /**
- * serializable id
- */
- private static final long serialVersionUID = 3838224353030247227L;
-
-
- /**
- * @param decorates
- * @param typeInfo
- */
- public ConverterDecorator(final ComponentInfo decorates, final ConverterTypeInfo typeInfo)
- {
- super(decorates);
- _typeInfo = typeInfo;
- }
-
- /**
- * @return the converter's type info.
- */
- public final ConverterTypeInfo getTypeInfo()
- {
- return _typeInfo;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/ConverterTypeInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/ConverterTypeInfo.java
deleted file mode 100644
index a613210..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/ConverterTypeInfo.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package org.eclipse.jst.jsf.common.runtime.internal.model.decorator;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.types.ClassTypeInfo;
-
-/**
- * Type information about a converter.
- *
- * @author cbateman
- *
- */
-public class ConverterTypeInfo extends ClassTypeInfo
-{
- /**
- * serializable id
- */
- private static final long serialVersionUID = -7238952424045449907L;
-
- private final String _converterId;
-
- /**
- * For unknown converters, use the UNKNOWN constant.
- *
- * @param className
- * @param converterId
- * @throws java.lang.IllegalArgumentException
- * if both className and converterId are null.
- *
- */
- public ConverterTypeInfo(String className, String converterId)
- {
- super(className, new String[0], new String[0]);
- if (className == null && converterId == null)
- {
- throw new IllegalArgumentException(
- "converterClass and converterId must not both be null. For unknown validator use the UNKNOWN constant");
- }
-
- _converterId = converterId;
- }
-
- /**
- * For unknown converters, use the UNKNOWN constant.
- *
- * @param className
- * @param superClasses
- * @param interfaces
- * @param converterId
- * @throws java.lang.IllegalArgumentException
- * if both className and converterId are null.
- *
- */
- public ConverterTypeInfo(String className, String[] superClasses,
- String[] interfaces, String converterId)
- {
- super(className, superClasses, interfaces);
- if (className == null && converterId == null)
- {
- throw new IllegalArgumentException(
- "converterClass and converterId must not both be null. For unknown validator use the UNKNOWN constant");
- }
-
- _converterId = converterId;
- }
-
- /**
- * Use when the converter's information unknown such as occurs when using
- * the f:converter tag.
- */
- public static final ConverterTypeInfo UNKNOWN = new ConverterTypeInfo(
- (Object) null);
-
- /**
- * A private constructor used to create the UNRESOLVED constant. We use an
- * Object arg here (which is discarded) rather than using the zero-arg
- * constructor so as not mess up anything like Serializable that may depend
- * on how zero-arg constructors are defined.
- *
- * @param unresolved
- */
- private ConverterTypeInfo(Object unresolved)
- {
- super(null, new String[0], new String[0]);
- _converterId = null;
- }
-
- /**
- * @return the converter's id.
- */
- public final String getConverterId()
- {
- return _converterId;
- }
-
- public String toString()
- {
- return "Converter Type Info: type = " + _converterId + ", "+super.toString();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/Decorator.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/Decorator.java
deleted file mode 100644
index 043c660..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/Decorator.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.eclipse.jst.jsf.common.runtime.internal.model.decorator;
-
-import java.io.Serializable;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.ViewObject;
-
-/**
- * The abstract super-class of all view object decorators.
- *
- * @author cbateman
- *
- */
-public abstract class Decorator extends ViewObject implements Serializable {
-
- /**
- * serializable id
- */
- private static final long serialVersionUID = -3138829736243154022L;
-
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/FacetDecorator.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/FacetDecorator.java
deleted file mode 100644
index ba73e66..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/FacetDecorator.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.eclipse.jst.jsf.common.runtime.internal.model.decorator;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.ComponentInfo;
-
-/**
- * Component decorator for facets.
- *
- * @author cbateman
- *
- */
-public class FacetDecorator extends ComponentDecorator
-{
- /**
- *
- */
- private static final long serialVersionUID = 94806944978127012L;
-
- private final String _name;
-
- /**
- * @param name
- * @param component
- */
- public FacetDecorator(final String name, final ComponentInfo component) {
- super(component);
- _name = name;
- }
-
- /**
- * @return the name of the facet.
- */
- public final String getName() {
- return _name;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/ValidatorDecorator.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/ValidatorDecorator.java
deleted file mode 100644
index cc4f692..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/ValidatorDecorator.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.eclipse.jst.jsf.common.runtime.internal.model.decorator;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.ComponentInfo;
-
-/**
- * Validator decorator.
- *
- * @author cbateman
- *
- */
-public class ValidatorDecorator extends ComponentDecorator {
- /**
- *
- */
- private static final long serialVersionUID = -2898015711621314782L;
-
- private final ValidatorTypeInfo _typeInfo;
-
- /**
- * @param decorates
- * @param typeInfo
- */
- public ValidatorDecorator(final ComponentInfo decorates, final ValidatorTypeInfo typeInfo) {
- super(decorates);
- _typeInfo = typeInfo;
- }
-
- /**
- * @return the validator's type info
- */
- public final ValidatorTypeInfo getTypeInfo()
- {
- return _typeInfo;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/ValidatorTypeInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/ValidatorTypeInfo.java
deleted file mode 100644
index 3bfe90b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/ValidatorTypeInfo.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package org.eclipse.jst.jsf.common.runtime.internal.model.decorator;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.types.ClassTypeInfo;
-
-/**
- * Type information about validator decorator.
- * @author cbateman
- *
- */
-public class ValidatorTypeInfo extends ClassTypeInfo
-{
- /**
- *
- */
- private static final long serialVersionUID = 7512992316792276160L;
- private final String _validatorId;
-
- /**
- * For unknown validators, use the UNKNOWN constant.
- *
- * @param validatorClass
- * @param validatorId
- * @throws java.lang.IllegalArgumentException if both className and
- * converterId are null.
- *
- */
- public ValidatorTypeInfo(String validatorClass, String validatorId)
- {
- super(validatorClass, new String[0], new String[0]);
-
- if (validatorClass == null && validatorId == null)
- {
- throw new IllegalArgumentException("validatorClass and validatorId must not both be null. For unknown validator use the UNKNOWN constant");
- }
- _validatorId = validatorId;
- }
-
- /**
- * For unknown validators, use the UNKNOWN constant.
- *
- * @param validatorClass
- * @param superClasses
- * @param interfaces
- * @param validatorId
- * @throws java.lang.IllegalArgumentException if both className and
- * converterId are null.
- *
- */
- public ValidatorTypeInfo(String validatorClass, String[] superClasses, String[] interfaces, String validatorId)
- {
- super(validatorClass, superClasses, interfaces);
-
- if (validatorClass == null && validatorId == null)
- {
- throw new IllegalArgumentException("validatorClass and validatorId must not both be null. For unknown validator use the UNKNOWN constant");
- }
- _validatorId = validatorId;
- }
-
- /**
- * Use when a validator's type info information is unknown.
- */
- public static final ValidatorTypeInfo UNKNOWN =
- new ValidatorTypeInfo((Object)null);
-
- /**
- * A private constructor used to create the UNRESOLVED constant.
- * We use an Object arg here (which is discarded) rather than using
- * the zero-arg constructor so as not mess up anything like Serializable
- * that may depend on how zero-arg constructors are defined.
- *
- * @param unresolved
- */
- private ValidatorTypeInfo(Object unresolved)
- {
- super(null, new String[0], new String[0]);
- _validatorId = null;
- }
-
- /**
- * @return the validator id (may be null if unknown).
- */
- public final String getValidatorId()
- {
- return _validatorId;
- }
-
- public String toString()
- {
- return "Validator Type Info: type = " + _validatorId + ", "+super.toString();
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/ValueChangeListenerDecorator.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/ValueChangeListenerDecorator.java
deleted file mode 100644
index af28605..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/ValueChangeListenerDecorator.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.eclipse.jst.jsf.common.runtime.internal.model.decorator;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.ComponentInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.event.IValueChangeListenerInfo;
-
-/**
- * ValueChangeListener component decorator.
- *
- * @author cbateman
- *
- */
-public class ValueChangeListenerDecorator extends ComponentDecorator implements
- IValueChangeListenerInfo
-{
- /**
- * serializable id
- */
- private static final long serialVersionUID = 9045831927898936727L;
-
- /**
- * @param decorates
- */
- public ValueChangeListenerDecorator(ComponentInfo decorates) {
- super(decorates);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/event/IActionListenerInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/event/IActionListenerInfo.java
deleted file mode 100644
index a1ae4bb..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/event/IActionListenerInfo.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.eclipse.jst.jsf.common.runtime.internal.model.event;
-
-/**
- * A design time analog for the ActionListener
- * @author cbateman
- *
- */
-public interface IActionListenerInfo extends IFacesListenerInfo
-{
- // TODO:
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/event/IFacesListenerInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/event/IFacesListenerInfo.java
deleted file mode 100644
index d94f1bd..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/event/IFacesListenerInfo.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.eclipse.jst.jsf.common.runtime.internal.model.event;
-
-/**
- * A design-time analog for the runtime Faces Listener.
- * @author cbateman
- *
- */
-public interface IFacesListenerInfo
-{
- // no methods
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/event/IValueChangeListenerInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/event/IValueChangeListenerInfo.java
deleted file mode 100644
index 155a4f1..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/event/IValueChangeListenerInfo.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.eclipse.jst.jsf.common.runtime.internal.model.event;
-
-/**
- * A design time analog for the runtime ValueChangeListener interface.
- *
- * @author cbateman
- *
- */
-public interface IValueChangeListenerInfo extends IFacesListenerInfo {
- // TODO:
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/types/ClassTypeInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/types/ClassTypeInfo.java
deleted file mode 100644
index ba6ef3d..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/types/ClassTypeInfo.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package org.eclipse.jst.jsf.common.runtime.internal.model.types;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * A type info that has class information.
- *
- * @author cbateman
- *
- */
-public abstract class ClassTypeInfo extends TypeInfo implements IClassTypeInfo
-{
- /**
- * serializable id
- */
- private static final long serialVersionUID = -5046230589012357680L;
-
- /**
- * the fully qualified class name of the implementation class for this
- * type.
- */
- protected final String _className;
-
- /**
- * known super classes of the component class
- */
- protected final String[] _superClasses;
-
- /**
- * known interfaces implemented by the component class
- */
- protected final String[] _interfaces;
-
- /**
- * used internally by isInstanceOf
- */
- private Set _superTypes; // may be lazily constructed
-
-
- /**
- * @param className
- * @param superClasses
- * @param interfaces
- */
- protected ClassTypeInfo(final String className, final String[] superClasses, final String[] interfaces)
- {
- _className = className;
- _superClasses = superClasses != null ? superClasses : new String[0];
- _interfaces = interfaces != null ? interfaces : new String[0];
-
- if (_superClasses.length + _interfaces.length == 0)
- {
- // there are no super-types known
- _superTypes = Collections.EMPTY_SET;
- }
- }
-
- public final String[] getInterfaces()
- {
- if (_interfaces.length > 0)
- {
- final String[] copy = new String[_interfaces.length];
- System.arraycopy(_interfaces, 0, copy, 0, _interfaces.length);
- return copy;
- }
- // if array is empty, no need to allocate to new objects since
- // it is effectively immutable anyway.
- return _interfaces;
- }
-
- public final String[] getSuperClasses()
- {
- if (_superClasses.length > 0)
- {
- final String[] copy = new String[_superClasses.length];
- System.arraycopy(_superClasses, 0, copy, 0, _superClasses.length);
- return copy;
- }
- // if array is empty, no need to allocate to new objects since
- // it is effectively immutable anyway.
- return _superClasses;
- }
-
- public final boolean isInstanceOf(String checkType)
- {
- if (_superTypes == null)
- {
- _superTypes = new HashSet();
- _superTypes.addAll(Arrays.asList(_superClasses));
- _superTypes.addAll(Arrays.asList(_interfaces));
- }
-
- return _superTypes.contains(checkType);
- }
-
- public final String getClassName()
- {
- return _className;
- }
-
- public String toString()
- {
- String supers = "[";
-
- for (int i = 0; i < _superClasses.length; i++)
- {
- supers += _superClasses[i];
-
- if (i < _superClasses.length-1)
- {
- supers += ",";
- }
- }
-
- for (int i = 0; i < _interfaces.length; i++)
- {
- supers += _interfaces[i];
-
- if (i < _interfaces.length-1)
- {
- supers += ",";
- }
- }
- supers +="]";
-
- return "class= "+getClassName()+ ", supers="+ supers;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/types/IAttributeValueProxy.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/types/IAttributeValueProxy.java
deleted file mode 100644
index 35d6972..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/types/IAttributeValueProxy.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.eclipse.jst.jsf.common.runtime.internal.model.types;
-
-import java.io.Serializable;
-
-/**
- * Wraps
- * @author cbateman
- *
- */
-public interface IAttributeValueProxy extends Serializable
-{
-//
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/types/IClassTypeInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/types/IClassTypeInfo.java
deleted file mode 100644
index 7959c6f..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/types/IClassTypeInfo.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.eclipse.jst.jsf.common.runtime.internal.model.types;
-
-/**
- * A type info that has an associate Java class.
- * @author cbateman
- *
- */
-public interface IClassTypeInfo
-{
- /**
- * The fully qualified class name, i.e. java.lang.String
- *
- * @return the fully qualified class name in dot notation
- *
- */
- String getClassName();
-
- /**
- * Should never return null. Return empty array if none.
- *
- * @return the list of fully-qualified super class names. List is as
- * calculated at IClassTypeInfo construction and no guarantee is made
- * (although an implementer may do so) that it will be updated if the
- * definition of className changes.
- */
- String[] getSuperClasses();
-
- /**
- * Should never return null. Return empty array if none.
- *
- * @return the list of fully-qualified interface names. List is as
- * calculated at IClassTypeInfo construction and no guarantee is made
- * (although an implementer may do so) that it will be updated if the
- * definition of className changes.
- */
- String[] getInterfaces();
-
- /**
- * @param checkType
- * @return true if checkType is in the set comprised of getSuperClasses()+getInterfaces()
- */
- boolean isInstanceOf(final String checkType);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/types/TypeInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/types/TypeInfo.java
deleted file mode 100644
index 1d3ea33..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/types/TypeInfo.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.eclipse.jst.jsf.common.runtime.internal.model.types;
-
-import java.io.Serializable;
-
-/**
- * Abstract super-class of all view object type information objects.
- *
- * @author cbateman
- *
- */
-public abstract class TypeInfo implements Serializable
-{
- /**
- * serializable id
- */
- private static final long serialVersionUID = -3653573923653759724L;
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/IComponentTagElement.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/IComponentTagElement.java
deleted file mode 100644
index 7eb5509..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/IComponentTagElement.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.eclipse.jst.jsf.common.runtime.internal.view.model.common;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.ComponentTypeInfo;
-
-/**
- * A JSF tag element that maps one-to-one to a JSF UIComponent
- *
- * @author cbateman
- *
- */
-public interface IComponentTagElement extends IJSFTagElement
-{
- /**
- * @return the comopnent's type info.
- */
- ComponentTypeInfo getComponent();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/IConverterTagElement.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/IConverterTagElement.java
deleted file mode 100644
index a26a7bd..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/IConverterTagElement.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.eclipse.jst.jsf.common.runtime.internal.view.model.common;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ConverterTypeInfo;
-
-/**
- * A tag element that causes the construction registration of a converter on
- * a parent object.
- *
- * @author cbateman
- *
- */
-public interface IConverterTagElement extends IJSFTagElement
-{
- /**
- * @return the type info for the converter represented by this
- * element
- */
- ConverterTypeInfo getConverter();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/IHandlerTagElement.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/IHandlerTagElement.java
deleted file mode 100644
index 4b21316..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/IHandlerTagElement.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package org.eclipse.jst.jsf.common.runtime.internal.view.model.common;
-
-import java.io.Serializable;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.types.TypeInfo;
-
-/**
- * Generic tag handler that has effect when processed by the JSF ViewHandler.
- *
- * @author cbateman
- *
- */
-public interface IHandlerTagElement extends IJSFTagElement
-{
- /**
- * Enumerates known types of built-in tag handlers.
- *
- * @author cbateman
- *
- */
- static class TagHandlerType extends TypeInfo implements Serializable
- {
- /**
- * serializable id
- */
- private static final long serialVersionUID = 5062853948108253861L;
-
- private final static int HANDLER_TYPE_FACET = 0;
- private final static int HANDLER_TYPE_ACTIONLISTENER = 1;
- private final static int HANDLER_TYPE_VALUECHANGELISTENER = 2;
- private final static int HANDLER_TYPE_ATTRIBUTE = 3;
-
- private final static String[] strValues =
- {"facet", "actionLister", "valueChangeListener"};
-
- private final int _intValue;
-
- public TagHandlerType(int intValue)
- {
- _intValue = intValue;
- }
-
- public String toString()
- {
- return strValues[_intValue];
- }
-
- protected final int intValue()
- {
- return _intValue;
- }
-
- public final static TagHandlerType FACET =
- new TagHandlerType(HANDLER_TYPE_FACET);
- public final static TagHandlerType ACTIONLISTENER =
- new TagHandlerType(HANDLER_TYPE_ACTIONLISTENER);
- public final static TagHandlerType VALUECHANGELISTENER =
- new TagHandlerType(HANDLER_TYPE_VALUECHANGELISTENER);
- public final static TagHandlerType ATTRIBUTE =
- new TagHandlerType(HANDLER_TYPE_ATTRIBUTE);
-
- }
-
- /**
- * @return the tag handler type as defined by standard known types of
- * tags that do not (necessarily) translate into standard objects at
- * runtime but may modify the view in some way.
- */
- TagHandlerType getTagHandlerType();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/IJSFTagElement.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/IJSFTagElement.java
deleted file mode 100644
index 5263b91..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/IJSFTagElement.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.eclipse.jst.jsf.common.runtime.internal.view.model.common;
-
-import java.io.Serializable;
-
-/**
- * An abstraction of a tag element that maps to a JSF artifact (i.e. component, validator)
- *
- * @author cbateman
- *
- */
-public interface IJSFTagElement extends ITagElement
-{
- /**
- * An enumeration of different kinds of tags.
- *
- * @author cbateman
- *
- */
- static class TagType implements Serializable
- {
- /**
- * serializable id
- */
- private static final long serialVersionUID = -2845327764902349963L;
- private final static int TYPE_COMPONENT = 0;
- private final static int TYPE_CONVERTER = 1;
- private final static int TYPE_VALIDATOR = 2;
- private final static int TYPE_HANDLER = 3;
- //private final static int TYPE_UNKNOWN = 4;
-
- private final static String[] strValues =
- {"component", "converter", "validator", "handler"};
-
- private final int _intValue;
-
- public TagType(int intValue)
- {
- _intValue = intValue;
- }
-
- public String toString()
- {
- return strValues[_intValue];
- }
-
- protected final int intValue()
- {
- return _intValue;
- }
-
- public final static TagType COMPONENT =
- new TagType(TYPE_COMPONENT);
- public final static TagType CONVERTER =
- new TagType(TYPE_CONVERTER);
- public final static TagType VALIDATOR =
- new TagType(TYPE_VALIDATOR);
- public final static TagType HANDLER =
- new TagType(TYPE_HANDLER);
- }
-
- /**
- * @return the type of tag as distinguished by how it may affect the
- * view at runtime.
- */
- TagType getType();
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/ITagElement.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/ITagElement.java
deleted file mode 100644
index cdcae48..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/ITagElement.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.eclipse.jst.jsf.common.runtime.internal.view.model.common;
-
-/**
- * Super-interface of all JSF tag elements.
- *
- * @author cbateman
- *
- */
-public interface ITagElement {
-
- /**
- * @return the name of the tag
- */
- public abstract String getName();
-
- /**
- * @return the namespace uri for this tag
- */
- public abstract String getUri();
-
- /**
- * @return the fully qualified class name in dot separated format
- * (i.e. javax.faces.webapp.ConverterTag)
- */
- public abstract String getTagHandlerClassName();
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/IValidatorTagElement.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/IValidatorTagElement.java
deleted file mode 100644
index 370ab46..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/IValidatorTagElement.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.eclipse.jst.jsf.common.runtime.internal.view.model.common;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ValidatorTypeInfo;
-
-/**
- * Represents a tag element for a JSF validator.
- *
- * @author cbateman
- *
- */
-public interface IValidatorTagElement extends IJSFTagElement
-{
- /**
- * @return the type info about the validator.
- */
- ValidatorTypeInfo getValidator();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/Namespace.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/Namespace.java
deleted file mode 100644
index b6be0ad..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/Namespace.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.eclipse.jst.jsf.common.runtime.internal.view.model.common;
-
-import java.util.Collection;
-
-/**
- * Abstracts an xml namespace used to define a set of view tags
- *
- */
-public abstract class Namespace
-{
- /**
- * @return the namespace uri. MUST NOT BE NULL
- */
- public abstract String getNSUri();
-
- /**
- * This call may be long running. Call isInitialized to determine if all
- * information is already cached, or if calling this method is likely
- * to take a long time.
- *
- * @return the view elements in this namespace. May be empty but MUST NOT BE
- * NULL.
- */
- public abstract Collection getViewElements();
-
- /**
- * This method should be light weight if possible. Unlike calling
- * getViewElements().isEmpty, this call should not require that all
- * view element children of this namespace be analyzed and constructed in
- * order to succeed.
- *
- * @return true if this name space has view element children
- */
- public abstract boolean hasViewElements();
-
- /**
- * If calculating all view elements is expensive, a Namespace implementation
- * may defer calculation until a specific element is requested. A caller of
- * getViewElements (such as a UI that shows all tags), may wish to know if
- * the entire namespace has been initialized before calling it, since it may
- * be long running.
- *
- * @return true if the namespace's elements have been fully initialized. If this
- * method returns false, care should be taken in calling getViewElements() and
- * getViewElement() since they may be very long running.
- */
- public abstract boolean isInitialized();
-
- /**
- * @param name
- * @return the tag element called 'name' or null if none.
- */
- public abstract ITagElement getViewElement(final String name);
-
- /**
- * @return a user readable display name for this namespace or null if none.
- */
- public abstract String getDisplayName();
-
- public String toString()
- {
- return getNSUri();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/TagElement.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/TagElement.java
deleted file mode 100644
index 640778a..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/TagElement.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.eclipse.jst.jsf.common.runtime.internal.view.model.common;
-
-/**
- * Abstract a tag element used to construct a view element
- *
- * @author cbateman
- *
- */
-public abstract class TagElement implements ITagElement
-{
- /* (non-Javadoc)
- * @see viewhandlerprototype.model.ITagElement#getName()
- */
- public abstract String getName();
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.runtime.internal.view.model.common.ITagElement#getUri()
- */
- public abstract String getUri();
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.runtime.internal.view.model.common.ITagElement#getTagHandlerClassName()
- */
- public abstract String getTagHandlerClassName();
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/.classpath b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/.cvsignore b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/.cvsignore
deleted file mode 100644
index f9eb27a..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-build.xml
-@dot
-javaCompiler...args
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/.project b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/.project
deleted file mode 100644
index 2cf9838..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.pagedesigner.jsf.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/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/.settings/org.eclipse.core.resources.prefs b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 8fcb2c1..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun May 27 16:05:18 EDT 2007
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/.settings/org.eclipse.jdt.core.prefs b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index a09df04..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,79 +0,0 @@
-#Tue Oct 23 12:01:25 PDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-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.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-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=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-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=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=error
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-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.5
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/.settings/org.eclipse.jdt.ui.prefs b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 82eb6c1..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Apr 06 18:25:15 PDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/>
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/META-INF/MANIFEST.MF b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index bdd4dca..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,40 +0,0 @@
-Manifest-Version: 1.0
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.pagedesigner.jsf.ui;singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.jst.pagedesigner.jsf.ui.JSFUIPlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.jst.jsf.facesconfig;bundle-version="[1.0.0,1.1.0)",
- org.eclipse.jst.pagedesigner;bundle-version="[1.0.0,1.1.0)",
- org.eclipse.jst.pagedesigner.jsp.core;bundle-version="[1.0.0,1.1.0)",
- org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.jsf.common.ui;bundle-version="[1.0.0,1.1.0)",
- org.eclipse.jst.jsf.core;bundle-version="[1.0.0,1.1.0)",
- org.eclipse.jst.jsf.common;bundle-version="[1.0.0,1.1.0)",
- org.eclipse.wst.sse.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.xml.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.gef;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.views.properties.tabbed;bundle-version="[3.2.0,4.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-ManifestVersion: 2
-Export-Package: org.eclipse.jst.pagedesigner.jsf.core.dom;x-internal:=true,
- org.eclipse.jst.pagedesigner.jsf.ui;x-internal:=true,
- org.eclipse.jst.pagedesigner.jsf.ui.actions;x-internal:=true,
- org.eclipse.jst.pagedesigner.jsf.ui.attributegroup;x-internal:=true,
- org.eclipse.jst.pagedesigner.jsf.ui.celleditors;x-internal:=true,
- org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml;x-internal:=true,
- org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfcore;x-internal:=true,
- org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfhtml;x-internal:=true,
- org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf;x-internal:=true,
- org.eclipse.jst.pagedesigner.jsf.ui.elementedit.jsfcore;x-internal:=true,
- org.eclipse.jst.pagedesigner.jsf.ui.elementedit.jsfhtml;x-internal:=true,
- org.eclipse.jst.pagedesigner.jsf.ui.elementedit.request;x-internal:=true,
- org.eclipse.jst.pagedesigner.jsf.ui.elementedit.util;x-internal:=true,
- org.eclipse.jst.pagedesigner.jsf.ui.sections;x-internal:=true,
- org.eclipse.jst.pagedesigner.jsf.ui.util;x-internal:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/about.html b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/about.html
deleted file mode 100644
index 72f94ad..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 06, 2007</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/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</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.</p>
-
-</body>
-</html>
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/build.properties b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/build.properties
deleted file mode 100644
index 0e522c2..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/build.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2007 Oracle 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:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = .,\
- plugin.xml,\
- META-INF/,\
- configs/,\
- plugin.properties,\
- about.html,\
- icons/
-javacSource=1.5
-javacTarget=1.5
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/configs/cm/jsfcore.properties b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/configs/cm/jsfcore.properties
deleted file mode 100644
index 25183a0..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/configs/cm/jsfcore.properties
+++ /dev/null
@@ -1,35 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2006 Oracle 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:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-Attribute.Label.basename=Basename
-Attribute.Label.binding=Binding
-Attribute.Label.converterId=Converter ID
-Attribute.Label.dateStyle=Date Style
-Attribute.Label.escape=Escape
-Attribute.Label.currencyCode=Currency Code
-Attribute.Label.groupingUsed=Grouping Used
-Attribute.Label.id=ID
-Attribute.Label.integerOnly=Integer Only
-Attribute.Label.itemDisabled=Item Disabled
-Attribute.Label.locale=Locale
-Attribute.Label.maximum=Maximum
-Attribute.Label.minimum=Minimum
-Attribute.Label.name=Name
-Attribute.Label.pattern=Pattern
-Attribute.Label.rendered=Rendered
-Attribute.Label.timeStyle=Time Style
-Attribute.Label.timeZone=Time Zone
-Attribute.Label.type=Type
-Attribute.Label.validatorId=Validator ID
-Attribute.Label.value=Value
-Attribute.Label.var=Var
-Category.Label.Constraint=Constraint
-Category.Label.General=General
-Category.Label.Other=Other
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/configs/cm/jsfcore.xml b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/configs/cm/jsfcore.xml
deleted file mode 100644
index d5f3094..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/configs/cm/jsfcore.xml
+++ /dev/null
@@ -1,227 +0,0 @@
-<?xml version="1.0" ?>
-<taglib uri="http://java.sun.com/jsf/core">
- <tag name="actionListener">
- <category name="General"
- displaylabel="%Category.Label.General">
- <attribute name="type" type="CLASSNAME" required="required"
- typeparam="superType=I:javax.faces.event.ActionListener"
- displaylabel="%Attribute.Label.type" />
- </category>
- </tag>
- <tag name="attribute">
- <category name="General"
- displaylabel="%Category.Label.General">
- <attribute name="name" displaylabel="%Attribute.Label.name" required="required"/>
- <attribute name="value" required="required"
- displaylabel="%Attribute.Label.value" />
- </category>
- </tag>
- <tag name="convertDateTime">
- <category name="General"
- displaylabel="%Category.Label.General">
- <attribute name="dateStyle" type="ENUMERATED"
- displaylabel="%Attribute.Label.dateStyle">
- <option key="short" value="short" />
- <option key="medium" value="medium" />
- <option key="long" value="long" />
- <option key="full" value="full" />
- <option key="default" value="default" default="default"/>
- </attribute>
- <attribute name="locale" type="LOCALE"
- displaylabel="%Attribute.Label.locale" />
- <attribute name="pattern" type="ENUMERATED"
- displaylabel="%Attribute.Label.pattern">
- <option key="M/d/yy" value="M/d/yy" />
- <option key="EEE, M/d/yy" value="EEE, M/d/yy" />
- <option key="MM/dd/yyyy" value="MM/dd/yyyy" />
- <option key="EEE, MM/dd/yyyy" value="EEE, MM/dd/yyyy" />
- <option key="MMM d, yyyy" value="MMM d, yyyy" />
- <option key="EEE, MMM d, yyyy" value="EEE, MMM d, yyyy" />
- <option key="MMMM d, yyyy" value="MMMM d, yyyy" />
- <option key="EEEE, MMMM d, yyyy"
- value="EEEE, MMMM d, yyyy" />
- <option key="MMMM yyyy" value="MMMM yyyy" />
- <option key="hh:mm" value="hh:mm" />
- <option key="hh:mm z" value="hh:mm z" />
- <option key="HH:mm z" value="HH:mm z" />
- <option key="HH:mm:ss z" value="HH:mm:ss z" />
- <option key="M/d/yy hh:mm" value="M/d/yy hh:mm" />
- <option key="EEE, M/d/yy hh:mm"
- value="EEE, M/d/yy hh:mm" />
- <option key="MM/dd/yyyy HH:mm:ss z"
- value="MM/dd/yyyy HH:mm:ss z" />
- <option key="EEE, MM/dd/yyyy HH:mm:ss z"
- value="EEE, MM/dd/yyyy HH:mm:ss z" />
- <option key="MMM d, yyyy HH:mm z"
- value="MMM d, yyyy HH:mm z" />
- <option key="EEE, MMM d, yyyy HH:mm z"
- value="EEE, MMM d, yyyy HH:mm z" />
- <option key="MMMM d, yyyy HH:mm z"
- value="MMMM d, yyyy HH:mm z" />
- <option key="EEEE, MMMM d, yyyy HH:mm z"
- value="EEEE, MMMM d, yyyy HH:mm z" />
- </attribute>
- <attribute name="timeStyle" type="ENUMERATED"
- displaylabel="%Attribute.Label.timeStyle">
- <option key="short" value="short" />
- <option key="medium" value="medium" />
- <option key="long" value="long" />
- <option key="full" value="full" />
- <option key="default" value="default" default="default"/>
- </attribute>
- <attribute name="timeZone" type="TIMEZONE"
- displaylabel="%Attribute.Label.timeZone" />
- <attribute name="type" type="ENUMERATED"
- displaylabel="%Attribute.Label.type">
- <option key="date" value="date" default="default"/>
- <option key="time" value="time" />
- <option key="both" value="both" />
- </attribute>
- </category>
- </tag>
- <tag name="converter">
- <category name="General"
- displaylabel="%Category.Label.General">
- <attribute name="converterId" required="required"
- displaylabel="%Attribute.Label.converterId" type="converterId"/>
- </category>
- </tag>
- <tag name="convertNumber">
- <category name="General"
- displaylabel="%Category.Label.General">
- <attribute name="locale" type="LOCALE"
- displaylabel="%Attribute.Label.locale" />
- <attribute name="type" displaylabel="%Attribute.Label.type"
- type="ENUMERATED">
- <option key="number" value="number" default="default"/>
- <option key="currency" value="currency" />
- <option key="percentage" value="percentage" />
- </attribute>
- </category>
- <category name="Other" displaylabel="%Category.Label.Other">
- <attribute name="currencyCode"
- displaylabel="%Attribute.Label.currencyCode" type="CURRENCYCODE" />
- <attribute name="groupingUsed"
- displaylabel="%Attribute.Label.groupingUsed" type="BOOLEAN" />
- <attribute name="integerOnly"
- displaylabel="%Attribute.Label.integerOnly" type="BOOLEAN" />
- <attribute name="pattern"
- displaylabel="%Attribute.Label.pattern" type="ENUMERATED">
- <option key="0" value="0" />
- <option key="0.00" value="0.00" />
- <option key="#,##0" value="#,##0" />
- <option key="#,##0.00" value="#,##0.00" />
- <option key="#,##0;(#,##0)" value="#,##0;(#,##0)" />
- <option key="#,##0.00;(#,##0.00)"
- value="#,##0.00;(#,##0.00)" />
- <option key="0.##E0" value="0.##E0" />
- <option key="0%" value="0%" />
- <option key="0.00%" value="0.00%" />
- </attribute>
- </category>
- </tag>
- <tag name="facet">
- <category name="General"
- displaylabel="%Category.Label.General">
- <attribute name="name" displaylabel="%Attribute.Label.name" required="required"/>
- </category>
- </tag>
- <tag name="loadBundle">
- <category name="General"
- displaylabel="%Category.Label.General">
- <attribute name="basename" type="CLASSPATH_RESOURCE" required="required"
- displaylabel="%Attribute.Label.basename" />
- <attribute name="var" displaylabel="%Attribute.Label.var" required="required"/>
- </category>
- </tag>
- <tag name="param">
- <referedcategory ref="General">
- <includeattrs>
- <attribute name="name"
- displaylabel="%Attribute.Label.name" />
- <attribute name="value"
- displaylabel="%Attribute.Label.value" required="required"/>
- </includeattrs>
- </referedcategory>
- </tag>
- <tag name="selectItem">
- <referedcategory ref="General" />
- <category name="Other" displaylabel="%Category.Label.Other">
- <attribute name="itemDisabled"
- displaylabel="%Attribute.Label.itemDisabled" type="BOOLEAN" typeparam="default=false" />
- </category>
- </tag>
- <tag name="selectItems">
- <referedcategory ref="General" />
- </tag>
- <tag name="subview">
- <referedcategory ref="General">
- <includeattrs>
- <attribute name="id" displaylabel="%Attribute.Label.id" required="required"/>
- </includeattrs>
- <excludeattrs refs="value" />
-
- </referedcategory>
- <category name="Other" displaylabel="%Category.Label.Other">
- <attribute name="rendered" type="BOOLEAN"
- displaylabel="%Attribute.Label.rendered" />
- </category>
- </tag>
- <tag name="validateDoubleRange">
- <referedcategory ref="Constraint" />
- </tag>
- <tag name="validateLength">
- <referedcategory ref="Constraint" />
- </tag>
- <tag name="validateLongRange">
- <referedcategory ref="Constraint" />
- </tag>
- <tag name="validator">
- <category name="General"
- displaylabel="%Category.Label.General">
- <attribute name="validatorId"
- displaylabel="%Attribute.Label.validatorId" type="validatorId" required="required"/>
- </category>
- </tag>
- <tag name="valueChangeListener">
- <category name="General"
- displaylabel="%Category.Label.General">
- <attribute name="type" type="CLASSNAME" required="required"
- typeparam="superType=I:javax.faces.event.ValueChangeListener"
- displaylabel="%Attribute.Label.type" />
- </category>
- </tag>
- <tag name="verbatim">
- <category name="General"
- displaylabel="%Category.Label.General">
- <attribute name="escape" type="BOOLEAN" typeparam="default=false"
- displaylabel="%Attribute.Label.escape" />
- </category>
- </tag>
- <tag name="view">
- <category name="General"
- displaylabel="%Category.Label.General">
- <attribute name="locale" type="LOCALE"
- displaylabel="%Attribute.Label.locale" />
- </category>
- </tag>
- <definition>
- <categories>
- <category name="General"
- displaylabel="%Category.Label.General">
- <attribute name="id" displaylabel="%Attribute.Label.id" />
- <attribute name="value"
- displaylabel="%Attribute.Label.value" />
- <attribute name="binding" type="PROPERTYBINDING"
- displaylabel="%Attribute.Label.binding" />
- </category>
- <category name="Constraint"
- displaylabel="%Category.Label.Constraint">
- <attribute name="minimum"
- displaylabel="%Attribute.Label.minimum" />
- <attribute name="maximum"
- displaylabel="%Attribute.Label.maximum" />
- </category>
- </categories>
- </definition>
-</taglib>
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/configs/cm/jsfhtml.properties b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/configs/cm/jsfhtml.properties
deleted file mode 100644
index 9b68fcd..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/configs/cm/jsfhtml.properties
+++ /dev/null
@@ -1,112 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2006 Oracle 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:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-Attribute.Label.accept=Accept
-Attribute.Label.acceptcharset=Accept Charset
-Attribute.Label.accesskey=Access Key
-Attribute.Label.action=Action
-Attribute.Label.actionListener=ActionListener
-Attribute.Label.alt=Alt
-Attribute.Label.bgcolor=BG Color
-Attribute.Label.binding=Binding
-Attribute.Label.border=Border
-Attribute.Label.cellpadding=Cell Padding
-Attribute.Label.cellspacing=Cell Spacing
-Attribute.Label.charset=Charset
-Attribute.Label.cols=Cols
-Attribute.Label.columnClasses=Column Classes
-Attribute.Label.columns=Columns
-Attribute.Label.converter=Converter
-Attribute.Label.coords=Coords
-Attribute.Label.dir=Dir
-Attribute.Label.disabled=Disabled
-Attribute.Label.disabledClass=Disabled Class
-Attribute.Label.enabledClass=Enabled Class
-Attribute.Label.enctype=Enctype
-Attribute.Label.errorClass=Error Class
-Attribute.Label.errorStyle=Error Style
-Attribute.Label.escape=Escape
-Attribute.Label.fatalClass=Fatal Class
-Attribute.Label.fatalStyle=Fatal Style
-Attribute.Label.first=First
-Attribute.Label.footerClass=Footer Class
-Attribute.Label.for=For
-Attribute.Label.frame=Frame
-Attribute.Label.globalOnly=Global Only
-Attribute.Label.headerClass=Header Class
-Attribute.Label.height=Height
-Attribute.Label.hreflang=Hreflang
-Attribute.Label.id=ID
-Attribute.Label.image=Image
-Attribute.Label.immediate=Immediate
-Attribute.Label.infoClass=Info Class
-Attribute.Label.infoStyle=Info Style
-Attribute.Label.ismap=Ismap
-Attribute.Label.lang=Lang
-Attribute.Label.layout=Layout
-Attribute.Label.link=Link
-Attribute.Label.longdesc=Longdesc
-Attribute.Label.maxlength=Max Length
-Attribute.Label.onblur=Onblur
-Attribute.Label.onchange=Onchange
-Attribute.Label.onclick=Onclick
-Attribute.Label.ondblclick=Ondblclick
-Attribute.Label.onfocus=Onfocus
-Attribute.Label.onkeydown=Onkeydown
-Attribute.Label.onkeypress=Onkeypress
-Attribute.Label.onkeyup=Onkeyup
-Attribute.Label.onmousedown=Onmousedown
-Attribute.Label.onmousemove=Onmousemove
-Attribute.Label.onmouseout=Onmouseout
-Attribute.Label.onmouseover=Onmouseover
-Attribute.Label.onmouseup=Onmouseup
-Attribute.Label.onreset=Onreset
-Attribute.Label.onselect=Onselect
-Attribute.Label.onsubmit=Onsubmit
-Attribute.Label.readonly=Read Only
-Attribute.Label.redisplay=Redisplay
-Attribute.Label.rel=Rel
-Attribute.Label.rendered=Rendered
-Attribute.Label.required=Required
-Attribute.Label.rev=Rev
-Attribute.Label.rowClasses=Row Classes
-Attribute.Label.rows=Rows
-Attribute.Label.rules=Rules
-Attribute.Label.shape=Shape
-Attribute.Label.showDetail=Show Detail
-Attribute.Label.showSummary=Show Summary
-Attribute.Label.size=Size
-Attribute.Label.style=Style
-Attribute.Label.styleClass=Style Class
-Attribute.Label.summary=Summary
-Attribute.Label.tabindex=Tab Index
-Attribute.Label.target=Target
-Attribute.Label.title=Title
-Attribute.Label.tooltip=Tooltip
-Attribute.Label.type=Type
-Attribute.Label.url=URL
-Attribute.Label.usemap=Usemap
-Attribute.Label.validator=Validator
-Attribute.Label.value=Value
-Attribute.Label.valueChangeListener=ValueChangeListener
-Attribute.Label.var=Var
-Attribute.Label.warnClass=Warn Class
-Attribute.Label.warnStyle=Warn Style
-Attribute.Label.width=Width
-Category.Label.CSS=CSS
-Category.Label.CSS2=CSS2
-Category.Label.CSS3=CSS3
-Category.Label.CSS4=CSS4
-Category.Label.Event=Event
-Category.Label.HTML=HTML
-Category.Label.JSF=JSF
-Category.Label.Language=Language
-Category.Label.Link=Link
-Category.Label.Table=Table
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/configs/cm/jsfhtml.xml b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/configs/cm/jsfhtml.xml
deleted file mode 100644
index 6ccfbcf..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/configs/cm/jsfhtml.xml
+++ /dev/null
@@ -1,713 +0,0 @@
-<?xml version="1.0" ?>
-<taglib uri="http://java.sun.com/jsf/html">
- <tag name="column">
- <category name="JSF" displaylabel="%Category.Label.JSF">
- <attribute name="id" displaylabel="%Attribute.Label.id" />
- <attribute name="binding" type="PROPERTYBINDING"
- displaylabel="%Attribute.Label.binding" />
- <attribute name="rendered" type="BOOLEAN"
- displaylabel="%Attribute.Label.rendered" />
- </category>
- </tag>
- <tag name="commandButton">
- <referedcategory ref="JSF">
- <includeattrs>
- <attribute name="action"
- displaylabel="%Attribute.Label.action" description="action"/>
- <attribute name="actionListener" type="METHODBINDING"
- displaylabel="%Attribute.Label.actionListener" />
- </includeattrs>
- <excludeattrs
- refs="converter,validator,valueChangeListener,required" />
- </referedcategory>
- <referedcategory ref="Language" />
- <referedcategory ref="CSS" />
- <referedcategory ref="Event" />
- <referedcategory ref="HTML">
- <includeattrs>
- <attribute name="type" type="ENUMERATED"
- displaylabel="%Attribute.Label.type">
- <option key="submit" value="submit" default="default"/>
- <option key="reset" value="reset" />
- </attribute>
- <attribute name="image" type="RELATIVEPATH"
- typeparam="suffix=jpg;gif;png"
- displaylabel="%Attribute.Label.image" />
- <attribute name="alt"
- displaylabel="%Attribute.Label.alt" />
- </includeattrs>
- </referedcategory>
- </tag>
- <tag name="commandLink">
- <referedcategory ref="JSF">
- <includeattrs>
- <attribute name="action"
- displaylabel="%Attribute.Label.action" />
- <attribute name="actionListener" type="METHODBINDING"
- displaylabel="%Attribute.Label.actionListener" />
- </includeattrs>
- <excludeattrs
- refs="converter,validator,valueChangeListener,required" />
- </referedcategory>
- <referedcategory ref="Language" />
- <referedcategory ref="CSS" />
- <referedcategory ref="Event">
- <excludeattrs refs="onchange,onclick,onselect" />
- </referedcategory>
- <referedcategory ref="Link" displaylabel="%Category.Label.HTML" />
- </tag>
- <tag name="dataTable">
- <category name="JSF" displaylabel="%Category.Label.JSF">
- <attribute name="id" displaylabel="%Attribute.Label.id" />
- <attribute name="value"
- displaylabel="%Attribute.Label.value" />
- <attribute name="binding" type="PROPERTYBINDING"
- displaylabel="%Attribute.Label.binding" />
- <attribute name="var" displaylabel="%Attribute.Label.var" />
- <attribute name="rendered" type="BOOLEAN"
- displaylabel="%Attribute.Label.rendered" />
- <attribute name="rows" displaylabel="%Attribute.Label.rows" />
- <attribute name="first"
- displaylabel="%Attribute.Label.first" />
- </category>
- <referedcategory ref="Language" />
- <referedcategory ref="CSS3" displaylabel="%Category.Label.CSS" />
- <referedcategory ref="Event">
- <excludeattrs refs="onblur,onchange,onfocus,onselect" />
- </referedcategory>
- <referedcategory ref="Table"
- displaylabel="%Category.Label.HTML" />
- </tag>
- <tag name="form">
- <category name="JSF" displaylabel="%Category.Label.JSF">
- <attribute name="id" displaylabel="%Attribute.Label.id" />
- <attribute name="binding" type="PROPERTYBINDING"
- displaylabel="%Attribute.Label.binding" />
- <attribute name="rendered" type="BOOLEAN"
- displaylabel="%Attribute.Label.rendered" />
- </category>
- <referedcategory ref="Language" />
- <referedcategory ref="CSS" />
- <referedcategory ref="Event">
- <includeattrs>
- <attribute name="onreset"
- displaylabel="%Attribute.Label.onreset" />
- <attribute name="onsubmit"
- displaylabel="%Attribute.Label.onsubmit" />
- </includeattrs>
- <excludeattrs refs="onblur,onchange,onfocus,onselect" />
- </referedcategory>
- <category name="HTML" displaylabel="%Category.Label.HTML">
- <attribute name="target" type="ENUMERATED"
- displaylabel="%Attribute.Label.target">
- <option key="_self" value="_self" />
- <option key="_blank" value="_blank" />
- <option key="_parent" value="_parent" />
- <option key="_top" value="_top" />
- </attribute>
- <attribute name="accept"
- displaylabel="%Attribute.Label.accept" />
- <attribute name="acceptcharset"
- displaylabel="%Attribute.Label.acceptcharset" />
- <attribute name="enctype"
- displaylabel="%Attribute.Label.enctype" type="ENUMERATED">
- <option key="application/x-www-form-urlencoded"
- value="application/x-www-form-urlencoded" default="default"/>
- </attribute>
- <attribute name="title"
- displaylabel="%Attribute.Label.title" />
- </category>
- </tag>
- <tag name="graphicImage">
- <category name="JSF" displaylabel="%Category.Label.JSF">
- <attribute name="value" type="WEBPATH"
- typeparam="suffix=jpg;gif;png"
- displaylabel="%Attribute.Label.value" />
- <attribute name="url" type="WEBPATH"
- typeparam="suffix=jpg;gif;png" displaylabel="%Attribute.Label.url" />
- <attribute name="binding" type="PROPERTYBINDING"
- displaylabel="%Attribute.Label.binding" />
- <attribute name="id" displaylabel="%Attribute.Label.id" />
- <attribute name="rendered" type="BOOLEAN"
- displaylabel="%Attribute.Label.rendered" />
- </category>
- <referedcategory ref="Language" />
- <referedcategory ref="CSS" />
- <referedcategory ref="Event">
- <excludeattrs refs="onblur,onchange,onfocus,onselect" />
- </referedcategory>
- <category name="HTML" displaylabel="%Category.Label.HTML">
- <attribute name="ismap" type="NAMED-BOOLEAN"
- displaylabel="%Attribute.Label.ismap" />
- <attribute name="longdesc" type="RELATIVEPATH"
- displaylabel="%Attribute.Label.longdesc" />
- <attribute name="alt" displaylabel="%Attribute.Label.alt" />
- <attribute name="height"
- displaylabel="%Attribute.Label.height" />
- <attribute name="title"
- displaylabel="%Attribute.Label.title" />
- <attribute name="usemap"
- displaylabel="%Attribute.Label.usemap" />
- <attribute name="width"
- displaylabel="%Attribute.Label.width" />
- </category>
- </tag>
- <tag name="inputHidden">
- <referedcategory ref="JSF" />
- </tag>
- <tag name="inputSecret">
- <referedcategory ref="JSF" />
- <referedcategory ref="Language" />
- <referedcategory ref="CSS" />
- <referedcategory ref="Event" />
- <referedcategory ref="HTML">
- <includeattrs>
- <attribute name="maxlength"
- displaylabel="%Attribute.Label.maxlength" />
- <attribute name="redisplay" type="BOOLEAN"
- displaylabel="%Attribute.Label.redisplay" />
- <attribute name="alt"
- displaylabel="%Attribute.Label.alt" />
- <attribute name="size"
- displaylabel="%Attribute.Label.size" />
- </includeattrs>
- </referedcategory>
- </tag>
- <tag name="inputText">
- <referedcategory ref="JSF" />
- <referedcategory ref="Language" />
- <referedcategory ref="CSS" />
- <referedcategory ref="Event" />
- <referedcategory ref="HTML">
- <includeattrs>
- <attribute name="maxlength"
- displaylabel="%Attribute.Label.maxlength" />
- <attribute name="alt"
- displaylabel="%Attribute.Label.alt" />
- <attribute name="size"
- displaylabel="%Attribute.Label.size" />
- </includeattrs>
- </referedcategory>
- </tag>
- <tag name="inputTextarea">
- <referedcategory ref="JSF" />
- <referedcategory ref="Language" />
- <referedcategory ref="CSS" />
- <referedcategory ref="Event" />
- <referedcategory ref="HTML">
- <includeattrs>
- <attribute name="cols"
- displaylabel="%Attribute.Label.cols" />
- <attribute name="rows"
- displaylabel="%Attribute.Label.rows" />
- </includeattrs>
- </referedcategory>
- </tag>
- <tag name="message">
- <category name="JSF" displaylabel="%Category.Label.JSF">
- <attribute name="id" displaylabel="%Attribute.Label.id" />
- <attribute name="binding" type="PROPERTYBINDING"
- displaylabel="%Attribute.Label.binding" />
- <attribute name="for" displaylabel="%Attribute.Label.for" required="required"/>
- <attribute name="rendered" type="BOOLEAN"
- displaylabel="%Attribute.Label.rendered" />
- <attribute name="showDetail" type="BOOLEAN"
- typeparam="default=true" displaylabel="%Attribute.Label.showDetail" />
- <attribute name="showSummary" type="BOOLEAN"
- typeparam="default=false"
- displaylabel="%Attribute.Label.showSummary" />
- </category>
- <referedcategory ref="CSS2" displaylabel="%Category.Label.CSS" />
- <category name="HTML" displaylabel="%Category.Label.HTML">
- <attribute name="tooltip" type="BOOLEAN"
- displaylabel="%Attribute.Label.tooltip" />
- <attribute name="title"
- displaylabel="%Attribute.Label.title" />
- </category>
- </tag>
- <tag name="messages">
- <category name="JSF" displaylabel="%Category.Label.JSF">
- <attribute name="id" displaylabel="%Attribute.Label.id" />
- <attribute name="binding" type="PROPERTYBINDING"
- displaylabel="%Attribute.Label.binding" />
- <attribute name="globalOnly" type="BOOLEAN"
- typeparam="default=false"
- displaylabel="%Attribute.Label.globalOnly" />
- <attribute name="rendered" type="BOOLEAN"
- displaylabel="%Attribute.Label.rendered" />
- <attribute name="showDetail" type="BOOLEAN"
- typeparam="default=false"
- displaylabel="%Attribute.Label.showDetail" />
- <attribute name="showSummary" type="BOOLEAN"
- typeparam="default=true"
- displaylabel="%Attribute.Label.showSummary" />
- </category>
- <referedcategory ref="CSS2" displaylabel="%Category.Label.CSS" />
- <category name="HTML" displaylabel="%Category.Label.HTML">
- <attribute name="layout" type="ENUMERATED"
- displaylabel="%Attribute.Label.layout">
- <option key="list" value="list" default="default"/>
- <option key="table" value="table" />
- </attribute>
- <attribute name="tooltip" type="BOOLEAN"
- displaylabel="%Attribute.Label.tooltip" />
- <attribute name="title"
- displaylabel="%Attribute.Label.title" />
- </category>
- </tag>
- <tag name="outputFormat">
- <referedcategory ref="JSF">
- <excludeattrs
- refs="validator,valueChangeListener,immediate,required" />
- </referedcategory>
- <referedcategory ref="CSS" />
- <category name="HTML" displaylabel="%Category.Label.HTML">
- <attribute name="escape" type="BOOLEAN"
- typeparam="default=true" displaylabel="%Attribute.Label.escape" />
- <attribute name="title"
- displaylabel="%Attribute.Label.title" />
- </category>
- </tag>
- <tag name="outputLabel">
- <referedcategory ref="JSF">
- <excludeattrs
- refs="validator,valueChangeListener,immediate,required" />
- </referedcategory>
- <referedcategory ref="Language" />
- <referedcategory ref="CSS" />
- <referedcategory ref="Event">
- <excludeattrs refs="onchange,onselect" />
- </referedcategory>
- <referedcategory ref="HTML">
- <includeattrs>
- <attribute name="for"
- displaylabel="%Attribute.Label.for" />
- </includeattrs>
- <excludeattrs refs="disabled,readonly" />
- </referedcategory>
- </tag>
- <tag name="outputLink">
- <referedcategory ref="JSF">
- <includeattrs>
- <attribute name="value" type="RELATIVEPATH"
- displaylabel="%Attribute.Label.value" />
- </includeattrs>
- <excludeattrs
- refs="validator,valueChangeListener,immediate,required" />
- </referedcategory>
- <referedcategory ref="Language" />
- <referedcategory ref="CSS" />
- <referedcategory ref="Event">
- <excludeattrs refs="onchange,onselect" />
- </referedcategory>
- <referedcategory ref="Link" displaylabel="%Category.Label.HTML" />
- </tag>
- <tag name="outputText">
- <referedcategory ref="JSF">
- <excludeattrs
- refs="validator,valueChangeListener,immediate,required" />
- </referedcategory>
- <referedcategory ref="CSS" />
- <category name="HTML" displaylabel="%Category.Label.HTML">
- <attribute name="escape" type="BOOLEAN"
- typeparam="default=true" displaylabel="%Attribute.Label.escape" />
- <attribute name="title"
- displaylabel="%Attribute.Label.title" />
- </category>
- </tag>
- <tag name="panelGrid">
- <category name="JSF" displaylabel="%Category.Label.JSF">
- <attribute name="id" displaylabel="%Attribute.Label.id" />
- <attribute name="binding" type="PROPERTYBINDING"
- displaylabel="%Attribute.Label.binding" />
- <attribute name="rendered" type="BOOLEAN"
- displaylabel="%Attribute.Label.rendered" />
- </category>
- <referedcategory ref="Language" />
- <referedcategory ref="CSS3" displaylabel="%Category.Label.CSS" />
- <referedcategory ref="Event">
- <excludeattrs refs="onblur,onchange,onfocus,onselect" />
- </referedcategory>
- <referedcategory ref="Table"
- displaylabel="%Category.Label.HTML">
- <includeattrs>
- <attribute name="columns"
- displaylabel="%Attribute.Label.columns" />
- </includeattrs>
- </referedcategory>
- </tag>
- <tag name="panelGroup">
- <category name="JSF" displaylabel="%Category.Label.JSF">
- <attribute name="id" displaylabel="%Attribute.Label.id" />
- <attribute name="binding" type="PROPERTYBINDING"
- displaylabel="%Attribute.Label.binding" />
- <attribute name="rendered" type="BOOLEAN"
- displaylabel="%Attribute.Label.rendered" />
- </category>
- <referedcategory ref="CSS" />
- </tag>
- <tag name="selectBooleanCheckbox">
- <referedcategory ref="JSF" />
- <referedcategory ref="Language" />
- <referedcategory ref="CSS" />
- <referedcategory ref="Event" />
- <referedcategory ref="HTML" />
- </tag>
- <tag name="selectManyCheckbox">
- <referedcategory ref="JSF" />
- <referedcategory ref="Language" />
- <referedcategory ref="CSS4" displaylabel="%Category.Label.CSS" />
- <referedcategory ref="Event" />
- <referedcategory ref="HTML">
- <includeattrs>
- <attribute name="layout" type="ENUMERATED"
- displaylabel="%Attribute.Label.layout">
- <option key="lineDirection" value="lineDirection" default="default" />
- <option key="pageDirection" value="pageDirection" />
- </attribute>
- <attribute name="border"
- displaylabel="%Attribute.Label.border" />
- </includeattrs>
- </referedcategory>
- </tag>
- <tag name="selectManyListbox">
- <referedcategory ref="JSF" />
- <referedcategory ref="Language" />
- <referedcategory ref="CSS4" displaylabel="%Category.Label.CSS" />
- <referedcategory ref="Event" />
- <referedcategory ref="HTML">
- <includeattrs>
- <attribute name="size"
- displaylabel="%Attribute.Label.size" />
- </includeattrs>
- </referedcategory>
- </tag>
- <tag name="selectManyMenu">
- <referedcategory ref="JSF" />
- <referedcategory ref="Language" />
- <referedcategory ref="CSS4" displaylabel="%Category.Label.CSS" />
- <referedcategory ref="Event" />
- <referedcategory ref="HTML" />
- </tag>
- <tag name="selectOneListbox">
- <referedcategory ref="JSF" />
- <referedcategory ref="Language" />
- <referedcategory ref="CSS4" displaylabel="%Category.Label.CSS" />
- <referedcategory ref="Event" />
- <referedcategory ref="HTML">
- <includeattrs>
- <attribute name="size"
- displaylabel="%Attribute.Label.size" />
- </includeattrs>
- </referedcategory>
- </tag>
- <tag name="selectOneMenu">
- <referedcategory ref="JSF" />
- <referedcategory ref="Language" />
- <referedcategory ref="CSS4" displaylabel="%Category.Label.CSS" />
- <referedcategory ref="Event" />
- <referedcategory ref="HTML" />
- </tag>
- <tag name="selectOneRadio">
- <referedcategory ref="JSF" />
- <referedcategory ref="Language" />
- <referedcategory ref="CSS4" displaylabel="%Category.Label.CSS" />
- <referedcategory ref="Event" />
- <referedcategory ref="HTML">
- <includeattrs>
- <attribute name="layout" type="ENUMERATED"
- displaylabel="%Attribute.Label.layout">
- <option key="lineDirection" value="lineDirection" default="default" />
- <option key="pageDirection" value="pageDirection" />
- </attribute>
- <attribute name="border"
- displaylabel="%Attribute.Label.border" />
- </includeattrs>
- </referedcategory>
- </tag>
- <definition>
- <categories>
- <category name="JSF" displaylabel="%Category.Label.JSF">
- <attribute name="id" displaylabel="%Attribute.Label.id" />
- <attribute name="value"
- displaylabel="%Attribute.Label.value" />
- <attribute name="binding" type="PROPERTYBINDING"
- displaylabel="%Attribute.Label.binding" />
- <attribute name="converter"
- displaylabel="%Attribute.Label.converter" />
- <attribute name="validator" type="METHODBINDING"
- displaylabel="%Attribute.Label.validator" />
- <attribute name="valueChangeListener"
- type="METHODBINDING"
- displaylabel="%Attribute.Label.valueChangeListener" />
- <attribute name="immediate" type="BOOLEAN"
- displaylabel="%Attribute.Label.immediate" />
- <attribute name="rendered" type="BOOLEAN"
- displaylabel="%Attribute.Label.rendered" />
- <attribute name="required" type="BOOLEAN"
- displaylabel="%Attribute.Label.required" />
- </category>
- <category name="Language"
- displaylabel="%Category.Label.Language">
- <referedattribute ref="lang" />
- <attribute name="dir" type="ENUMERATED"
- displaylabel="%Attribute.Label.dir">
- <option key="RTL" value="RTL" />
- <option key="LTR" value="LTR" />
- </attribute>
- </category>
- <category name="CSS" displaylabel="%Category.Label.CSS">
- <attribute name="style" type="CSSSTYLE"
- typeparam="style=STYLE" displaylabel="%Attribute.Label.style" />
- <attribute name="styleClass" type="CSSCLASS"
- typeparam=" " displaylabel="%Attribute.Label.styleClass" />
- </category>
- <category name="Event"
- displaylabel="%Category.Label.Event">
- <attribute name="onblur" type="JAVASCRIPT"
- displaylabel="%Attribute.Label.onblur" />
- <attribute name="onchange" type="JAVASCRIPT"
- displaylabel="%Attribute.Label.onchange" />
- <attribute name="onclick" type="JAVASCRIPT"
- displaylabel="%Attribute.Label.onclick" />
- <attribute name="ondblclick" type="JAVASCRIPT"
- displaylabel="%Attribute.Label.ondblclick" />
- <attribute name="onfocus" type="JAVASCRIPT"
- displaylabel="%Attribute.Label.onfocus" />
- <attribute name="onkeydown" type="JAVASCRIPT"
- displaylabel="%Attribute.Label.onkeydown" />
- <attribute name="onkeypress" type="JAVASCRIPT"
- displaylabel="%Attribute.Label.onkeypress" />
- <attribute name="onkeyup" type="JAVASCRIPT"
- displaylabel="%Attribute.Label.onkeyup" />
- <attribute name="onmousedown" type="JAVASCRIPT"
- displaylabel="%Attribute.Label.onmousedown" />
- <attribute name="onmousemove" type="JAVASCRIPT"
- displaylabel="%Attribute.Label.onmousemove" />
- <attribute name="onmouseout" type="JAVASCRIPT"
- displaylabel="%Attribute.Label.onmouseout" />
- <attribute name="onmouseover" type="JAVASCRIPT"
- displaylabel="%Attribute.Label.onmouseover" />
- <attribute name="onmouseup" type="JAVASCRIPT"
- displaylabel="%Attribute.Label.onmouseup" />
- <attribute name="onselect" type="JAVASCRIPT"
- displaylabel="%Attribute.Label.onselect" />
- </category>
- <category name="HTML" displaylabel="%Category.Label.HTML">
- <attribute name="accesskey"
- displaylabel="%Attribute.Label.accesskey" />
- <attribute name="disabled" type="BOOLEAN"
- displaylabel="%Attribute.Label.disabled" />
- <attribute name="readonly" type="BOOLEAN"
- displaylabel="%Attribute.Label.readonly" />
- <attribute name="title"
- displaylabel="%Attribute.Label.title" />
- <attribute name="tabindex"
- displaylabel="%Attribute.Label.tabindex" />
- </category>
- <category name="Link" displaylabel="%Category.Label.Link">
- <attribute name="accesskey"
- displaylabel="%Attribute.Label.accesskey" />
- <attribute name="title"
- displaylabel="%Attribute.Label.title" />
- <attribute name="tabindex"
- displaylabel="%Attribute.Label.tabindex" />
- <attribute name="charset"
- displaylabel="%Attribute.Label.charset" />
- <referedattribute ref="lang" overridename="hreflang"
- displaylabel="%Attribute.Label.hreflang" />
- <referedattribute ref="link" overridename="rel"
- displaylabel="%Attribute.Label.rel" />
- <attribute name="shape" type="ENUMERATED"
- displaylabel="%Attribute.Label.shape">
- <option key="default"
- value="Entire region" default="default"/>
- <option key="circle" value="Circular region" />
- <option key="rect" value="Rectangular region" />
- <option key="poly" value="Polygonal region" />
- </attribute>
- <attribute name="target" type="ENUMERATED"
- displaylabel="%Attribute.Label.target">
- <option key="_self" value="_self" />
- <option key="_blank" value="_blank" />
- <option key="_parent" value="_parent" />
- <option key="_top" value="_top" />
- </attribute>
- <attribute name="coords"
- displaylabel="%Attribute.Label.coords" />
- <referedattribute ref="link" overridename="rev"
- displaylabel="%Attribute.Label.rev" />
- <attribute name="type"
- displaylabel="%Attribute.Label.type" />
- </category>
- <category name="CSS2" displaylabel="%Category.Label.CSS2">
- <attribute name="style" type="CSSSTYLE"
- typeparam="style=STYLE" displaylabel="%Attribute.Label.style" />
- <attribute name="styleClass" type="CSSCLASS"
- typeparam=" " displaylabel="%Attribute.Label.styleClass" />
- <attribute name="infoStyle" type="CSSSTYLE"
- displaylabel="%Attribute.Label.infoStyle" />
- <attribute name="infoClass" type="CSSCLASS"
- typeparam=" " displaylabel="%Attribute.Label.infoClass" />
- <attribute name="warnStyle" type="CSSSTYLE"
- displaylabel="%Attribute.Label.warnStyle" />
- <attribute name="warnClass" type="CSSCLASS"
- typeparam=" " displaylabel="%Attribute.Label.warnClass" />
- <attribute name="errorStyle" type="CSSSTYLE"
- displaylabel="%Attribute.Label.errorStyle" />
- <attribute name="errorClass" type="CSSCLASS"
- typeparam=" " displaylabel="%Attribute.Label.errorClass" />
- <attribute name="fatalStyle" type="CSSSTYLE"
- displaylabel="%Attribute.Label.fatalStyle" />
- <attribute name="fatalClass" type="CSSCLASS"
- typeparam=" " displaylabel="%Attribute.Label.fatalClass" />
- </category>
- <category name="CSS3" displaylabel="%Category.Label.CSS3">
- <attribute name="style" type="CSSSTYLE"
- typeparam="style=STYLE" displaylabel="%Attribute.Label.style" />
- <attribute name="styleClass" type="CSSCLASS"
- typeparam=" " displaylabel="%Attribute.Label.styleClass" />
- <attribute name="columnClasses" type="CSSCLASS"
- typeparam="," displaylabel="%Attribute.Label.columnClasses" />
- <attribute name="footerClass" type="CSSCLASS"
- typeparam=" " displaylabel="%Attribute.Label.footerClass" />
- <attribute name="headerClass" type="CSSCLASS"
- typeparam=" " displaylabel="%Attribute.Label.headerClass" />
- <attribute name="rowClasses" type="CSSCLASS"
- typeparam="separator=," displaylabel="%Attribute.Label.rowClasses" />
- </category>
- <category name="CSS4" displaylabel="%Category.Label.CSS4">
- <attribute name="style" type="CSSSTYLE"
- typeparam="style=STYLE" displaylabel="%Attribute.Label.style" />
- <attribute name="styleClass" type="CSSCLASS"
- typeparam=" " displaylabel="%Attribute.Label.styleClass" />
- <attribute name="disabledClass" type="CSSCLASS"
- typeparam="" displaylabel="%Attribute.Label.disabledClass" />
- <attribute name="enabledClass" type="CSSCLASS"
- typeparam="" displaylabel="%Attribute.Label.enabledClass" />
- </category>
- <category name="Table"
- displaylabel="%Category.Label.Table">
- <attribute name="bgcolor" type="COLOR"
- displaylabel="%Attribute.Label.bgcolor" />
- <attribute name="border"
- displaylabel="%Attribute.Label.border" />
- <attribute name="cellpadding"
- displaylabel="%Attribute.Label.cellpadding" />
- <attribute name="cellspacing"
- displaylabel="%Attribute.Label.cellspacing" />
- <attribute name="width"
- displaylabel="%Attribute.Label.width" />
- <attribute name="frame" type="ENUMERATED"
- displaylabel="%Attribute.Label.frame">
- <option key="lhs" value="Left hand side only" />
- <option key="above" value="Top side only" />
- <option key="none" value="No sides" default="default"/>
- <option key="box" value="All four sides" />
- <option key="vsides"
- value="Right and left sides only" />
- <option key="below" value="Bottom side only" />
- <option key="border" value="All four sides" />
- <option key="rhs" value="Right hand side only" />
- <option key="hsides"
- value="Top and bottom sides only" />
- </attribute>
- <attribute name="rules" type="ENUMERATED"
- displaylabel="%Attribute.Label.rules">
- <option key="cols" value="Between columns only" />
- <option key="groups" value="Between row groups" />
- <option key="rows" value="Between rows only" />
- <option key="none" value="No rules" default="default"/>
- <option key="all"
- value="Between all rows and columns" />
- </attribute>
- <attribute name="summary"
- displaylabel="%Attribute.Label.summary" />
- <attribute name="title"
- displaylabel="%Attribute.Label.title" />
- </category>
- </categories>
- <attributes>
- <attribute name="lang" type="ENUMERATED"
- displaylabel="%Attribute.Label.lang">
- <option key="af" value="af Afrikaans" />
- <option key="ar" value="ar Arabic (needs subtype)" />
- <option key="be" value="be Belarusian" />
- <option key="bg" value="bg Bulgarian" />
- <option key="br" value="br Breton" />
- <option key="ca" value="ca Catalan" />
- <option key="cs" value="cs Czech" />
- <option key="da" value="da Danish" />
- <option key="de" value="de German (Standard)" />
- <option key="el" value="el Greek" />
- <option key="en" value="en English" />
- <option key="es" value="es Spanish (Spain)" />
- <option key="et" value="et Estonian" />
- <option key="eu" value="eu Basque" />
- <option key="fa" value="fa Farsi" />
- <option key="fi" value="fi Finnish" />
- <option key="fo" value="fo Faeroese" />
- <option key="fr" value="fr French (Standard)" />
- <option key="gd" value="gd Gaelic (Scotland)" />
- <option key="he" value="he Hebrew" />
- <option key="hi" value="hi Hindi" />
- <option key="hr" value="hr Croatian" />
- <option key="hu" value="hu Hungarian" />
- <option key="id" value="id Indonesian" />
- <option key="is" value="is Icelandic" />
- <option key="it" value="it Italian (Standard)" />
- <option key="ja" value="ja Japanese" />
- <option key="ko" value="ko Korean" />
- <option key="lt" value="lt Lithuanian" />
- <option key="lv" value="lv Latvian" />
- <option key="mk" value="mk Macedonian" />
- <option key="ms" value="ms Malaysian" />
- <option key="mt" value="mt Maltese" />
- <option key="nl" value="nl Dutch (Standard)" />
- <option key="no" value="no Norwegian (Bokmal/Nynorsk)" />
- <option key="pl" value="pl Polish" />
- <option key="pt" value="pt Portuguese (Standard)" />
- <option key="rm" value="rm Rhaeto-Romanic" />
- <option key="ro" value="ro Romanian" />
- <option key="ru" value="ru Russian" />
- <option key="sk" value="sk Slovak" />
- <option key="sl" value="sl Slovenian" />
- <option key="sq" value="sq Albanian" />
- <option key="sr" value="sr Serbian (Cyrillic/Latin)" />
- <option key="sv" value="sv Swedish" />
- <option key="sx" value="sx Sutu" />
- <option key="sz" value="sz Sami (Lappish)" />
- <option key="th" value="th Thai" />
- <option key="tn" value="tn Setswana" />
- <option key="tr" value="tr Turkish" />
- <option key="ts" value="ts Tsonga" />
- <option key="uk" value="uk Ukrainian" />
- <option key="ur" value="ur Urdu" />
- <option key="vi" value="vi Vietnamese" />
- <option key="xh" value="xh Xhosa" />
- <option key="yi" value="yi Yiddish" />
- <option key="zh" value="zh Chinese (needs subtype)" />
- <option key="zu" value="zu Zulu" />
- </attribute>
- <attribute name="link" type="MULTICHOICE" typeparam=" "
- displaylabel="%Attribute.Label.link">
- <option key="index" value="index" />
- <option key="subsection" value="subsection" />
- <option key="bookmark" value="bookmark" />
- <option key="start" value="start" />
- <option key="next" value="next" />
- <option key="stylesheet" value="stylesheet" />
- <option key="chapter" value="chapter" />
- <option key="help" value="help" />
- <option key="alternate" value="alternate" />
- <option key="appendix" value="appendix" />
- <option key="contents" value="contents" />
- <option key="section" value="section" />
- <option key="prev" value="prev" />
- <option key="glossary" value="glossary" />
- <option key="copyright" value="copyright" />
- </attribute>
- </attributes>
- </definition>
-
-</taglib>
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/column_select.gif b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/column_select.gif
deleted file mode 100644
index f9dc006..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/column_select.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/plugin.properties b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/plugin.properties
deleted file mode 100644
index f996154..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/plugin.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2006 Oracle 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:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-####################################################
-# Plugin XML information.
-####################################################
-pluginName=JavaServer Faces Tools - Pagedesigner UI
-providerName=Eclipse.org
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/plugin.xml b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/plugin.xml
deleted file mode 100644
index 7c5bbc6..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/plugin.xml
+++ /dev/null
@@ -1,477 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-
- <!-- page variables -->
- <extension point="org.eclipse.jst.pagedesigner.jsp.core.pageVar">
- <taglib uri="http://java.sun.com/jsf/html">
-
- <tag varTypeStringIsAttr="true" varNameIsAttr="true"
- varTypeMode="EXPRESSION_COLLECTION_ITEM" varTypeString="value"
- varName="var" tagName="dataTable" />
- </taglib>
- <taglib uri="http://java.sun.com/jsf/core">
- <tag varTypeStringIsAttr="true" varNameIsAttr="true"
- varTypeMode="BUNDLE" varTypeString="basename" varName="var"
- tagName="loadBundle" />
- </taglib>
- </extension>
-
- <!-- element and attribute meta data -->
- <!-- DISABLE CMREGISTRY ITEMS
- <extension point="org.eclipse.jst.pagedesigner.cmRegistry">
- <registry configFile="configs/cm/jsfcore.xml"
- uri="http://java.sun.com/jsf/core" />
- <registry configFile="configs/cm/jsfhtml.xml"
- uri="http://java.sun.com/jsf/html" />
- </extension>
- -->
-
- <extension
- point="org.eclipse.ui.views.properties.tabbed.propertySections">
- <propertySections
- contributorId="org.eclipse.jst.pagedesigner.tabPropertyContributor">
- <!-- Disable sections /delete later
- <propertySection afterSection="top"
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFCoreActionListenerSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.actionListener">
- <tagFilter caseSensitive="true"
- uri="http://java.sun.com/jsf/core" tagName="actionListener" />
- </propertySection>
- <propertySection afterSection="top"
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFCoreAttributeSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.attribute">
- <tagFilter caseSensitive="true"
- uri="http://java.sun.com/jsf/core" tagName="attribute" />
- </propertySection>
- <propertySection afterSection="top"
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFCoreConverterSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.converter">
- <tagFilter caseSensitive="true"
- uri="http://java.sun.com/jsf/core" tagName="converter" />
- </propertySection>
- <propertySection afterSection="top"
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFCoreFacetSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.facet">
- <tagFilter caseSensitive="true"
- uri="http://java.sun.com/jsf/core" tagName="facet" />
- </propertySection>
- <propertySection afterSection="top"
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFCoreLoadBundleSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.loadBundle">
- <tagFilter caseSensitive="true"
- uri="http://java.sun.com/jsf/core" tagName="loadBundle" />
- </propertySection>
- <propertySection afterSection="top"
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFCoreParamSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.param">
- <tagFilter caseSensitive="true"
- uri="http://java.sun.com/jsf/core" tagName="param" />
- </propertySection>
- <propertySection afterSection="top"
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFCoreSelectItemSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.selectItem">
- <tagFilter caseSensitive="true"
- uri="http://java.sun.com/jsf/core" tagName="selectItem" />
- </propertySection>
- <propertySection afterSection="top"
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFCoreSelectItemsSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.selectItems">
- <tagFilter caseSensitive="true"
- uri="http://java.sun.com/jsf/core" tagName="selectItems" />
- </propertySection>
- <propertySection afterSection="top"
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFCoreSubviewSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.subview">
- <tagFilter caseSensitive="true"
- uri="http://java.sun.com/jsf/core" tagName="subview" />
- </propertySection>
- <propertySection afterSection="top"
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFCoreValidateDoubleRangeSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.validateDoubleRange">
- <tagFilter caseSensitive="true"
- uri="http://java.sun.com/jsf/core" tagName="validateDoubleRange" />
- </propertySection>
- <propertySection afterSection="top"
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFCoreValidateLengthSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.validateLength">
- <tagFilter caseSensitive="true"
- uri="http://java.sun.com/jsf/core" tagName="validateLength" />
- </propertySection>
- <propertySection afterSection="top"
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFCoreValidateLongRangeSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.validateLongRange">
- <tagFilter caseSensitive="true"
- uri="http://java.sun.com/jsf/core" tagName="validateLongRange" />
- </propertySection>
- <propertySection afterSection="top"
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFCoreValidatorSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.validator">
- <tagFilter caseSensitive="true"
- uri="http://java.sun.com/jsf/core" tagName="validator" />
- </propertySection>
- <propertySection afterSection="top"
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFCoreValueChangeListenerSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.valueChangeListener">
- <tagFilter caseSensitive="true"
- uri="http://java.sun.com/jsf/core" tagName="valueChangeListener" />
- </propertySection>
- <propertySection afterSection="top"
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFCoreVerbatimSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.verbatim">
- <tagFilter caseSensitive="true"
- uri="http://java.sun.com/jsf/core" tagName="verbatim" />
- </propertySection>
- <propertySection afterSection="top"
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFCoreViewSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.view">
- <tagFilter caseSensitive="true"
- uri="http://java.sun.com/jsf/core" tagName="view" />
- </propertySection>
- <propertySection afterSection="top"
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlColumnSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.column">
- <tagFilter caseSensitive="true"
- uri="http://java.sun.com/jsf/html" tagName="column" />
- </propertySection>
- <propertySection afterSection="top"
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlCommandButtonSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.commandButton">
- <tagFilter caseSensitive="true"
- uri="http://java.sun.com/jsf/html" tagName="commandButton" />
- </propertySection>
- <propertySection afterSection="top"
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlCommandLinkSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.commandLink">
- <tagFilter caseSensitive="true"
- uri="http://java.sun.com/jsf/html" tagName="commandLink" />
- </propertySection>
- <propertySection afterSection="top"
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlDataTableSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.dataTable">
- <tagFilter caseSensitive="true"
- uri="http://java.sun.com/jsf/html" tagName="dataTable" />
- </propertySection>
- <propertySection afterSection="top"
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlFormSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.form">
- <tagFilter caseSensitive="true"
- uri="http://java.sun.com/jsf/html" tagName="form" />
- </propertySection>
- <propertySection afterSection="top"
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlGraphicImageSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.graphicImage">
- <tagFilter caseSensitive="true"
- uri="http://java.sun.com/jsf/html" tagName="graphicImage" />
- </propertySection>
- <propertySection afterSection="top"
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlInputHiddenSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.inputHidden">
- <tagFilter caseSensitive="true"
- uri="http://java.sun.com/jsf/html" tagName="inputHidden" />
- </propertySection>
- <propertySection afterSection="top"
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlMessageSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.message">
- <tagFilter caseSensitive="true"
- uri="http://java.sun.com/jsf/html" tagName="message" />
- </propertySection>
- <propertySection afterSection="top"
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlMessagesSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.messages">
- <tagFilter caseSensitive="true"
- uri="http://java.sun.com/jsf/html" tagName="messages" />
- </propertySection>
- <propertySection afterSection="top"
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlOutputFormatSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.outputFormat">
- <input
- type="org.eclipse.jst.pagedesigner.jsf.ui.Input1">
- </input>
- <tagFilter caseSensitive="true"
- uri="http://java.sun.com/jsf/html" tagName="outputFormat" />
- </propertySection>
- <propertySection afterSection="top"
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlInputTextSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.inputText">
- <tagFilter caseSensitive="true"
- uri="http://java.sun.com/jsf/html" tagName="inputText" />
- </propertySection>
- <propertySection afterSection="top"
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlOutputLabelSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.outputLabel">
- <tagFilter caseSensitive="true"
- uri="http://java.sun.com/jsf/html" tagName="outputLabel" />
- </propertySection>
- <propertySection afterSection="top"
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlOutputLinkSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.outputLink">
- <tagFilter caseSensitive="true"
- uri="http://java.sun.com/jsf/html" tagName="outputLink" />
- </propertySection>
- <propertySection afterSection="top"
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlOutputTextSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.outputText">
- <tagFilter caseSensitive="true"
- uri="http://java.sun.com/jsf/html" tagName="outputText" />
- </propertySection>
- <propertySection
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlInputTextareaSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.inputTextarea">
- </propertySection>
-
- <propertySection afterSection="top"
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlPanelGridSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.panelGrid">
- <tagFilter caseSensitive="true"
- uri="http://java.sun.com/jsf/html" tagName="panelGrid" />
- </propertySection>
- <propertySection afterSection="top"
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlPanelGroupSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.panelGroup">
- <tagFilter caseSensitive="true"
- uri="http://java.sun.com/jsf/html" tagName="panelGroup" />
- </propertySection>
- <propertySection afterSection="top"
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlSelectBooleanCheckboxSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.selectBooleanCheckbox">
- <tagFilter caseSensitive="true"
- uri="http://java.sun.com/jsf/html" tagName="selectBooleanCheckbox" />
- </propertySection>
- <propertySection afterSection="top"
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlSelectManyCheckboxSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.selectManyCheckbox">
- <tagFilter caseSensitive="true"
- uri="http://java.sun.com/jsf/html" tagName="selectManyCheckbox" />
- </propertySection>
- <propertySection afterSection="top"
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlSelectManyListboxSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.selectManyListbox">
- <tagFilter caseSensitive="true"
- uri="http://java.sun.com/jsf/html" tagName="selectManyListbox" />
- </propertySection>
- <propertySection afterSection="top"
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlSelectManyMenuSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.selectManyMenu">
- <tagFilter caseSensitive="true"
- uri="http://java.sun.com/jsf/html" tagName="selectManyMenu" />
- </propertySection>
- <propertySection afterSection="top"
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlInputSecretSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.inputSecret">
- </propertySection>
- <propertySection afterSection="top"
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlSelectOneListboxSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.selectOneListbox">
- <tagFilter caseSensitive="true"
- uri="http://java.sun.com/jsf/html" tagName="selectOneListbox" />
- </propertySection>
- <propertySection afterSection="top"
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlSelectOneMenuSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.selectOneMenu">
- <tagFilter caseSensitive="true"
- uri="http://java.sun.com/jsf/html" tagName="selectOneMenu" />
- </propertySection>
- <propertySection afterSection="top"
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlSelectOneRadioSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.selectOneRadio">
- <tagFilter caseSensitive="true"
- uri="http://java.sun.com/jsf/html" tagName="selectOneRadio" />
- </propertySection>
- -->
- <propertySection
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFCoreConvertDateTimeGroup"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.convertDateTime">
- </propertySection>
- <propertySection
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFCoreConvertNumberGroup"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.convertNumber">
- </propertySection>
- <propertySection
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlActionListenerSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.commandButton.listener">
- </propertySection>
- <propertySection
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlActionListenerSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.commandLink.listener">
- </propertySection>
- <propertySection
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlDataTableColumnsSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.dataTable.columns">
- </propertySection>
- <propertySection
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlInputHiddenTypeSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.inputHidden.type">
- </propertySection>
-
- <propertySection
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlInputSecretTypeSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.inputSecret.type">
- </propertySection>
- <propertySection
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlInputOthersSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.inputText.others">
- </propertySection>
- <propertySection
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlInputTextTypeSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.inputText.type">
- </propertySection>
- <propertySection
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlInputOthersSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.inputText.others">
- </propertySection>
- <propertySection
- afterSection="section.general.inputTextarea"
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlInputTextareaTypeSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.inputTextarea.type">
- </propertySection>
- <propertySection
- afterSection="section.general.inputTextarea.type"
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlInputOthersSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.inputTextarea.others">
- </propertySection>
- <propertySection
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlOutputFormatParamsSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.outputFormat.params">
- </propertySection>
- <propertySection
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlOutputTextConverterSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.outputText.converter">
- </propertySection>
- <propertySection
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlSelectChoicesSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.selectManyCheckbox.choices">
- </propertySection>
- <propertySection
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlSelectChoicesSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.selectManyListbox.choices">
- </propertySection>
- <propertySection
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlSelectChoicesSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.selectManyMenu.choices">
- </propertySection>
- <propertySection
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlSelectChoicesSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.selectOneListbox.choices">
- </propertySection>
- <propertySection
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlSelectChoicesSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.selectOneMenu.choices">
- </propertySection>
- <propertySection
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlSelectChoicesSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.selectOneRadio.choices">
- </propertySection>
- </propertySections>
- </extension>
-
- <extension
- point="org.eclipse.jst.pagedesigner.pageDesignerExtension">
- <tagConverterFactory
- class="org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfcore.JSFCoreConverterFactory" />
- <tagConverterFactory
- class="org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfhtml.JSFHTMLConverterFactory" />
- <elementEditFactory
- class="org.eclipse.jst.pagedesigner.jsf.ui.elementedit.jsfhtml.JSFHTMLElementEditFactory" />
- <elementEditFactory
- class="org.eclipse.jst.pagedesigner.jsf.ui.elementedit.jsfcore.JSFCoreElementEditFactory" />
- <linkCreator
- class="org.eclipse.jst.pagedesigner.jsf.ui.actions.JSFCommandLinkCreator"
- linkIdentifier="JSF CommandLink" />
- <linkCreator
- class="org.eclipse.jst.pagedesigner.jsf.ui.actions.JSFOutputLinkCreator"
- linkIdentifier="JSF OutputLink" />
- <tagTransformOperation
- class="org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf.ColumnOperation"
- id="ColumnOperation">
- </tagTransformOperation>
- <tagTransformOperation
- class="org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf.DataTableOperation"
- id="DataTableOperation">
- </tagTransformOperation>
- <tagTransformOperation
- class="org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf.PanelGridOperation"
- id="PanelGridOperation">
- </tagTransformOperation>
- <tagTransformOperation
- class="org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf.SelectManyCheckboxOperation"
- id="SelectManyCheckboxOperation">
- </tagTransformOperation>
- <tagTransformOperation
- class="org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf.SelectOneRadioOperation"
- id="SelectOneRadioOperation">
- </tagTransformOperation>
- <tagTransformOperation
- class="org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf.LoadBundleOperation"
- id="LoadBundleOperation">
- </tagTransformOperation>
- </extension>
-
- <extension
- point="org.eclipse.jst.pagedesigner.popupMenuContributor">
- <menuItemContributor
- class="org.eclipse.jst.pagedesigner.jsf.ui.actions.PageFlowContributor"
- URI="http://java.sun.com/jsf/core" />
- </extension>
-</plugin>
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/core/dom/JSFDOMUtil.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/core/dom/JSFDOMUtil.java
deleted file mode 100644
index 16992f7..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/core/dom/JSFDOMUtil.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.core.dom;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-import org.eclipse.jst.jsf.core.internal.tld.CMUtil;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class JSFDOMUtil
-{
-
- /**
- * @param parentEle
- * @param name
- * @return the facet element or null if not found
- */
- public static Element findFacet(Element parentEle, String name)
- {
- NodeList childnodes = parentEle.getChildNodes();
- for (int i=0, size=childnodes.getLength(); i<size; i++)
- {
- Node node = childnodes.item(i);
- if (node.getNodeType() == Node.ELEMENT_NODE && JSFDOMUtil.isFacet((Element)node))
- {
- Element ele = (Element) node;
- if (name.equals(ele.getAttribute("name")))
- {
- return ele;
- }
- }
- }
- return null;
- }
-
- /**
- * @param node
- * @return true if node is a JSF column
- */
- public static boolean isHColumn(Node node)
- {
- if (node instanceof Element)
- {
- Element ele = (Element) node;
- if ("column".equalsIgnoreCase(ele.getLocalName()) && ITLDConstants.URI_JSF_HTML.equals(CMUtil.getElementNamespaceURI(ele)))
- {
- return true;
- }
- }
-
- return false;
- }
-
- /**
- * @param panelGridEle
- * @return the list of UI component children
- */
- public static List getUIComponentChildren(Element panelGridEle)
- {
- // XXX: temp implementation. Later may move this out to be shared.
- // currently just returning all children Element. Need to filter out things like non JSF UI component
- List list = new ArrayList();
- NodeList childnodes = panelGridEle.getChildNodes();
- for (int i=0, size=childnodes.getLength(); i<size; i++)
- {
- Node node = childnodes.item(i);
- if (node.getNodeType() == Node.ELEMENT_NODE)
- {
- if (JSFDOMUtil.isFacet((Element) node))
- {
- continue;
- }
- list.add(node);
- }
- }
- return list;
- }
-
- /**
- * @param ele
- * @return true if ele is a facet
- */
- public static boolean isFacet(Element ele)
- {
- // XXX: here we are not checking namespace! for error tolerant.
- return "facet".equals(ele.getLocalName());
- }
-
- /**
- * @param ele
- * @return true if the local name of ele is "param"
- */
- public static boolean isUIParameter(Element ele)
- {
- return "param".equals(ele.getLocalName());
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/JSFUIPlugin.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/JSFUIPlugin.java
deleted file mode 100644
index ec0e9dd..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/JSFUIPlugin.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.ILog;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.jst.jsf.common.ui.IFileFolderConstants;
-import org.eclipse.jst.jsf.common.ui.JSFUICommonPlugin;
-import org.eclipse.jst.jsf.common.ui.internal.guiutils.Alerts;
-import org.eclipse.jst.jsf.common.ui.internal.logging.Logger;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class JSFUIPlugin extends AbstractUIPlugin
-{
- //The shared instance.
- private static JSFUIPlugin _plugin;
- //Resource bundle.
- private ResourceBundle _resourceBundle;
- private URL _pluginBase;
-
- private static Logger _logger;
- private static Alerts _alerts;
-
- /**
- * The constructor.
- */
- public JSFUIPlugin()
- {
- super();
- _plugin = this;
- try
- {
- _resourceBundle = ResourceBundle.getBundle("org.eclipse.jst.pagedesigner.jsf.ui.JSFUIPluginResources");
- }
- catch (MissingResourceException x)
- {
- _resourceBundle = null;
- }
- }
-
- /**
- * This method is called upon plug-in activation
- */
- public void start(BundleContext context) throws Exception
- {
- super.start(context);
- _alerts = new Alerts(this, _resourceBundle);
- _logger = JSFUICommonPlugin.getLogger(JSFUIPlugin.class);
-// _logger.setResourceBundle(_resourceBundle);
- _pluginBase = getBundle().getEntry("/");
- }
-
- /**
- * get the alerts objects associated with this plugin for alerting the user.
- * @return the alerts
- */
- public static Alerts getAlerts()
- {
- return _alerts;
- }
-
- /**
- * This method is called when the plug-in is stopped
- */
- public void stop(BundleContext context) throws Exception
- {
- super.stop(context);
- }
-
- /**
- * Returns the shared instance.
- * @return the default plugin
- */
- public static JSFUIPlugin getDefault()
- {
- return _plugin;
- }
-
- /**
- * Returns the string from the plugin's resource bundle,
- * or 'key' if not found.
- * @param key
- * @return the resource string for key or 'key' if not found
- */
- public static String getResourceString(String key)
- {
- ResourceBundle bundle = JSFUIPlugin.getDefault().getResourceBundle();
- try
- {
- return (bundle != null) ? bundle.getString(key) : key;
- }
- catch (MissingResourceException e)
- {
- return key;
- }
- }
-
- /**
- * Returns the plugin's resource bundle,
- * @return the resource bundle
- */
- public ResourceBundle getResourceBundle()
- {
- return _resourceBundle;
- }
-
- /**
- * Return an image from the path
- * @param name
- * @return Image
- */
- public Image getImage(String name)
- {
- if (name == null)
- {
- return null;
- }
-
- ImageRegistry images = getImageRegistry();
- Image image = images.get(name);
- if (image == null)
- {
- try
- {
- ImageDescriptor id = ImageDescriptor.createFromURL(new URL(_pluginBase,
- IFileFolderConstants.FOLDER_ICONS + "/" + name));
- images.put(name, id);
-
- image = images.get(name);
- }
- catch (MalformedURLException ee)
- {
- _logger.error("Error.JSFUIPlugin", name, ee); //$NON-NLS-2$
- }
- }
- return image;
- }
-
- /**
- * Log message and Throwable by severity.
- *
- * @param severity Severity (use appropriate IStatus constant).
- * @param message Message to be logged.
- * @param exception Throwable instance to be logged.
- */
- public static void log(int severity, String message, Throwable exception) {
- ILog log = getDefault().getLog();
- IStatus status = new Status(
- severity,
- "org.eclipse.jst.pagedesigner.jsf.ui",
- message,
- exception);
- log.log(status);
- }
-
- /**
- * Log message by severity.
- *
- * @param severity Severity (use an IStatus constant).
- * @param message Message to be logged.
- */
- public static void log(int severity, String message) {
- ILog log = getDefault().getLog();
- IStatus status = new Status(
- severity,
- "org.eclipse.jst.pagedesigner.jsf.ui",
- message);
- log.log(status);
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/JSFUIPluginResources.properties b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/JSFUIPluginResources.properties
deleted file mode 100644
index b628dc5..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/JSFUIPluginResources.properties
+++ /dev/null
@@ -1,50 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2007 Oracle 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:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-#DataTable
-ElementEdit.Submenu.DataTable=DataTable
-ElementEdit.Submenu.DataTable.SelectTable=Select Table
-ElementEdit.Submenu.DataTable.InsertColumnBefore=Insert Column Before
-ElementEdit.Submenu.DataTable.InsertColumnAfter=Insert Column After
-ElementEdit.Submenu.DataTable.DeleteColumn=Delete Column
-ElementEdit.Submenu.InsertTableHeader=Insert Table Header
-ElementEdit.Submenu.InsertTableFooter=Insert Table Footer
-ElementEdit.Submenu.DeleteTableHeader=Delete Table Header
-ElementEdit.Submenu.DeleteTableFooter=Delete Table Footer
-ElementEdit.Submenu.InsertColumnHeader=Insert Column Header
-ElementEdit.Submenu.InsertColumnFooter=Insert Column Footer
-ElementEdit.Submenu.DeleteColumnHeader=Delete Column Header
-ElementEdit.Submenu.DeleteColumnFooter=Delete Column Footer
-
-#PanelGrid
-ElementEdit.Submenu.PanelGrid=PanelGrid
-ElementEdit.Submenu.PanelGrid.SelectTable=Select Table
-ElementEdit.Submenu.PanelGrid.InsertRowBefore=Insert Row Before
-ElementEdit.Submenu.PanelGrid.InsertRowAfter=Insert Row After
-ElementEdit.Submenu.PanelGrid.InsertColumnBefore=Insert Column Before
-ElementEdit.Submenu.PanelGrid.InsertColumnAfter=Insert Column After
-ElementEdit.Submenu.PanelGrid.DeleteRow=Delete Row
-ElementEdit.Submenu.PanelGrid.DeleteColumn=Delete Column
-ElementEdit.Submenu.PanelGrid.InsertHeader=Insert Header
-ElementEdit.Submenu.PanelGrid.InsertFooter=Insert Footer
-ElementEdit.Submenu.PanelGird.DeleteHeader=Delete Header
-ElementEdit.Submenu.PanelGrid.DeleteFooter=Delete Footer
-
-ElementEdit.Submenu.JavaNavigation=Java
-ElementEdit.Submenu.JavaNavigation.Binding=Binding
-ElementEdit.Submenu.JavaNavigation.Value=Value
-ElementEdit.Submenu.JavaNavigation.Action=Action
-ElementEdit.Submenu.LoadBundle=Open Properties File
-
-#Warning messages
-Message.Warning.Title=Warning
-Message.Warning.InvalidateExpression=The value is either an invalid Expression or the definition is missing.
-
-Error.JSFUIPlugin=Error in jsf.ui plugin
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/JSFUIResources.properties b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/JSFUIResources.properties
deleted file mode 100644
index 0f86386..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/JSFUIResources.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2006 Oracle 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:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-MessageTagConverter.defaultValue=Message
-MessageTagConverter.defaultTooltip=Summary
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/ActionsResources.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/ActionsResources.java
deleted file mode 100644
index 77ee60b..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/ActionsResources.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.actions;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class ActionsResources
-{
- private static final String BUNDLE_NAME = "org.eclipse.jst.pagedesigner.jsf.ui.actions.ActionsResources"; //$NON-NLS-1$
-
- private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
- private ActionsResources()
- {
- // no external instantiation
- }
-
- /**
- * @param key
- * @return the res bundle string for key or !key! if not found
- */
- public static String getString(String key)
- {
- try
- {
- return RESOURCE_BUNDLE.getString(key);
- }
- catch (MissingResourceException e)
- {
- return '!' + key + '!';
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/ActionsResources.properties b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/ActionsResources.properties
deleted file mode 100644
index 2fa58f6..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/ActionsResources.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2006 Oracle 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:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-AddValueChangeListenerAction.ActionLabel.ValueChangeListener=ValueChangeListener
-AddValidateDoubleRangeAction.ActionLabel.DoubleRange=Double Range
-AddValidateLengthAction.ActionLabel.Length=Length
-AddValidateLongRangeAction.ActionLabel.LongRange=Long Range
-AddConvertDateTimeAction.ActionLabel.DateTime=Date Time
-AddConvertNumberAction.ActionLabel.Number=Number
-AddAttributeAction.Wizard.NewAttribute=New Attribute
-AddAttributeAction.ActionLabel.Attribute=Attribute
-AddSelectItemAction.ActionLabel.SelectItem=Select Item
-AddSelectItemsAction.ActionLabel.SelectItems=Select Items
-AddAttributeAction.Wizard.Description=Enter a name and value for the attribute.
-AddParamAction.ActionLabel.Param=Param
-
-Submenu.JSFAdd=JSF Add
-Submenu.JSFAdd.Converter=Converter
-Submenu.JSFAdd.Validators=Validators
-
-PageFlowContributor.Menu.PageFlow=PageFlow
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddActionListenerAction.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddActionListenerAction.java
deleted file mode 100644
index a0d0e73..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddActionListenerAction.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.actions;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.properties.attrgroup.DialogUtil;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class AddActionListenerAction extends JSFAddChildAction
-{
- /**
- * @param parentEle
- *
- */
- public AddActionListenerAction(IDOMElement parentEle)
- {
- super("ActionListener", parentEle); //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.Action#run()
- */
- public void run()
- {
- DialogUtil.createSubElement(getShell(), getParentElement(), ITLDConstants.URI_JSF_CORE, IJSFConstants.TAG_ACTIONLISTENER, new String[]{"type"});
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddAttributeAction.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddAttributeAction.java
deleted file mode 100644
index 3dcdaf0..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddAttributeAction.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.actions;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.properties.attrgroup.DialogUtil;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class AddAttributeAction extends JSFAddChildAction
-{
-
- /**
- * @param parentNode
- */
- public AddAttributeAction(IDOMElement parentNode)
- {
- super(ActionsResources.getString("AddAttributeAction.ActionLabel.Attribute"), parentNode); //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.Action#run()
- */
- public void run()
- {
- DialogUtil.createSubElement(getShell(), getParentElement(), ITLDConstants.URI_JSF_CORE, "attribute", new String[]{"name", "value"});
-// CommonDialogFieldGroup group = new CommonDialogFieldGroup();
-//
-// AttributeData[] data = createAttributeData();
-// group.setAttributeData(data);
-//
-// DialogFieldGroupPage page = new DialogFieldGroupPage("Attribute", group); //$NON-NLS-1$
-// page.setTitle(ActionsResources.getString("AddAttributeAction.Wizard.NewAttribute")); //$NON-NLS-1$
-// page.setDescription(ActionsResources.getString("AddAttributeAction.Wizard.Description")); //$NON-NLS-1$
-// CommonDialogFieldWizard wizard = new CommonDialogFieldWizard(page);
-// wizard.setWindowTitle(ActionsResources.getString("AddAttributeAction.Wizard.NewAttribute")); //$NON-NLS-1$
-// WizardDialog dialog = new WizardDialog(getShell(), wizard);
-// dialog.create();
-// if (dialog.open() == WizardDialog.OK)
-// {
-// group.prepareData();
-// Map attributesMap = new HashMap();
-// for (int i = 0; i < data.length; i++)
-// {
-// attributesMap.put(data[i].attributeName, data[i].value);
-// }
-// AddJSFCoreChildCommand command = new AddJSFCoreChildCommand(this.getParentElement(),
-// IJSFConstants.TAG_ATTRIBUTE, attributesMap);
-// command.execute();
-// }
- }
-
-// private AttributeData[] createAttributeData()
-// {
-// return new AttributeData[]
-// {
-// new AttributeData(IJMTConstants.URI_JSF_CORE, IJSFConstants.TAG_ATTRIBUTE, IJSFConstants.ATTR_NAME),
-// new AttributeData(IJMTConstants.URI_JSF_CORE, IJSFConstants.TAG_ATTRIBUTE, IJSFConstants.ATTR_VALUE)
-// }
-// ;
-// }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddConvertDateTimeAction.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddConvertDateTimeAction.java
deleted file mode 100644
index 6172669..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddConvertDateTimeAction.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.actions;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml.AddJSFCoreChildCommand;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class AddConvertDateTimeAction extends JSFAddChildAction
-{
-
- /**
- * @param parentNode
- */
- public AddConvertDateTimeAction(IDOMElement parentNode)
- {
- super(ActionsResources.getString("AddConvertDateTimeAction.ActionLabel.DateTime"), parentNode); //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.Action#run()
- */
- public void run()
- {
- AddJSFCoreChildCommand command = new AddJSFCoreChildCommand(this.getParentElement(),
- IJSFConstants.TAG_CONVERTDATETIME, null);
- command.execute();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddConvertNumberAction.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddConvertNumberAction.java
deleted file mode 100644
index af33b52..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddConvertNumberAction.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.actions;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml.AddJSFCoreChildCommand;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class AddConvertNumberAction extends JSFAddChildAction
-{
-
- /**
- * @param parentNode
- */
- public AddConvertNumberAction(IDOMElement parentNode)
- {
- super(ActionsResources.getString("AddConvertNumberAction.ActionLabel.Number"), parentNode); //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.Action#run()
- */
- public void run()
- {
- AddJSFCoreChildCommand command = new AddJSFCoreChildCommand(this.getParentElement(),
- IJSFConstants.TAG_CONVERTNUMBER, null);
- command.execute();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddConverterAction.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddConverterAction.java
deleted file mode 100644
index 67b2e30..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddConverterAction.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.actions;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml.AddJSFCoreChildCommand;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class AddConverterAction extends JSFAddChildAction
-{
- String _converterId;
-
- /**
- * @param converterId
- * @param parentNode
- */
- public AddConverterAction(String converterId, IDOMElement parentNode)
- {
- super(converterId, parentNode);
- this._converterId = converterId;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.Action#run()
- */
- public void run()
- {
- Map attributes = new HashMap();
- attributes.put("converterId", _converterId);
- AddJSFCoreChildCommand command = new AddJSFCoreChildCommand(this.getParentElement(),
- IJSFConstants.TAG_CONVERTER, attributes);
- command.execute();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddParamAction.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddParamAction.java
deleted file mode 100644
index 8cb1a74..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddParamAction.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.actions;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.properties.attrgroup.DialogUtil;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class AddParamAction extends JSFAddChildAction
-{
-
- /**
- * @param parentNode
- */
- public AddParamAction(IDOMElement parentNode)
- {
- super(ActionsResources.getString("AddParamAction.ActionLabel.Param"), parentNode); //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.Action#run()
- */
- public void run()
- {
- DialogUtil.createSubElement(getShell(), getParentElement(), ITLDConstants.URI_JSF_CORE,
- IJSFConstants.TAG_PARAM, new String[] { IJSFConstants.ATTR_NAME, IJSFConstants.ATTR_VALUE});
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddSelectItemAction.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddSelectItemAction.java
deleted file mode 100644
index c725801..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddSelectItemAction.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.actions;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.properties.attrgroup.DialogUtil;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class AddSelectItemAction extends JSFAddChildAction
-{
-
- /**
- * @param parentNode
- */
- public AddSelectItemAction(IDOMElement parentNode)
- {
- super(ActionsResources.getString("AddSelectItemAction.ActionLabel.SelectItem"), parentNode); //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.Action#run()
- */
- public void run()
- {
- DialogUtil.createSubElement(getShell(), getParentElement(), ITLDConstants.URI_JSF_CORE,
- IJSFConstants.TAG_SELECTITEM, new String[] { IJSFConstants.ATTR_ITEMLABEL, IJSFConstants.ATTR_ITEMVALUE});
- }
-}
-
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddSelectItemsAction.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddSelectItemsAction.java
deleted file mode 100644
index 5598887..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddSelectItemsAction.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.actions;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.properties.attrgroup.DialogUtil;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class AddSelectItemsAction extends JSFAddChildAction
-{
-
- /**
- * @param parentNode
- */
- public AddSelectItemsAction(IDOMElement parentNode)
- {
- super(ActionsResources.getString("AddSelectItemsAction.ActionLabel.SelectItems"), parentNode); //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.Action#run()
- */
- public void run()
- {
-// AddJSFCoreChildCommand command = new AddJSFCoreChildCommand(this.getParentElement(),
-// IJSFConstants.TAG_SELECTITEMS, attributes);
-// command.execute();
- DialogUtil.createSubElement(getShell(), getParentElement(), ITLDConstants.URI_JSF_CORE,
- IJSFConstants.TAG_SELECTITEMS, new String[] { IJSFConstants.ATTR_ID, IJSFConstants.ATTR_BINDING, IJSFConstants.ATTR_VALUE});
-
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddValidateDoubleRangeAction.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddValidateDoubleRangeAction.java
deleted file mode 100644
index c6c7855..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddValidateDoubleRangeAction.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.actions;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.properties.attrgroup.DialogUtil;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class AddValidateDoubleRangeAction extends JSFAddChildAction
-{
-
- /**
- * @param parentNode
- */
- public AddValidateDoubleRangeAction(IDOMElement parentNode)
- {
- super(ActionsResources.getString("AddValidateDoubleRangeAction.ActionLabel.DoubleRange"), parentNode); //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.Action#run()
- */
- public void run()
- {
- DialogUtil.createSubElement(getShell(), getParentElement(), ITLDConstants.URI_JSF_CORE,
- IJSFConstants.TAG_VALIDATEDOUBLERANGE, new String[] { IJSFConstants.ATTR_MINIMUM,
- IJSFConstants.ATTR_MAXIMUM});
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddValidateLengthAction.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddValidateLengthAction.java
deleted file mode 100644
index b89cf1d..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddValidateLengthAction.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.actions;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.properties.attrgroup.DialogUtil;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class AddValidateLengthAction extends JSFAddChildAction
-{
-
- /**
- * @param parentNode
- */
- public AddValidateLengthAction(IDOMElement parentNode)
- {
- super(ActionsResources.getString("AddValidateLengthAction.ActionLabel.Length"), parentNode); //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.Action#run()
- */
- public void run()
- {
- DialogUtil.createSubElement(getShell(), getParentElement(), ITLDConstants.URI_JSF_CORE,
- IJSFConstants.TAG_VALIDATELENGTH, new String[] { IJSFConstants.ATTR_MINIMUM,
- IJSFConstants.ATTR_MAXIMUM});
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddValidateLongRangeAction.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddValidateLongRangeAction.java
deleted file mode 100644
index a12ce56..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddValidateLongRangeAction.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.actions;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.properties.attrgroup.DialogUtil;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class AddValidateLongRangeAction extends JSFAddChildAction
-{
-
- /**
- * @param parentNode
- */
- public AddValidateLongRangeAction(IDOMElement parentNode)
- {
- super(ActionsResources.getString("AddValidateLongRangeAction.ActionLabel.LongRange"), parentNode); //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.Action#run()
- */
- public void run()
- {
- DialogUtil.createSubElement(getShell(), getParentElement(), ITLDConstants.URI_JSF_CORE,
- IJSFConstants.TAG_VALIDATELONGRANGE, new String[] { IJSFConstants.ATTR_MINIMUM,
- IJSFConstants.ATTR_MAXIMUM});
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddValidatorAction.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddValidatorAction.java
deleted file mode 100644
index 9124e34..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddValidatorAction.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.actions;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml.AddJSFCoreChildCommand;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class AddValidatorAction extends JSFAddChildAction
-{
- String _validatorId;
-
- /**
- * @param validatorId
- * @param parentNode
- */
- public AddValidatorAction(String validatorId, IDOMElement parentNode)
- {
- super(validatorId, parentNode);
- this._validatorId = validatorId;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.Action#run()
- */
- public void run()
- {
- Map attributes = new HashMap();
- attributes.put("validatorId", _validatorId);
- AddJSFCoreChildCommand command = new AddJSFCoreChildCommand(this.getParentElement(),
- IJSFConstants.TAG_VALIDATOR, attributes);
- command.execute();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddValueChangeListenerAction.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddValueChangeListenerAction.java
deleted file mode 100644
index cb76f44..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddValueChangeListenerAction.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.actions;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.properties.attrgroup.DialogUtil;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class AddValueChangeListenerAction extends JSFAddChildAction
-{
-
- /**
- * @param parentNode
- */
- public AddValueChangeListenerAction(IDOMElement parentNode)
- {
- super(ActionsResources.getString("AddValueChangeListenerAction.ActionLabel.ValueChangeListener"), parentNode); //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.Action#run()
- */
- public void run()
- {
- DialogUtil.createSubElement(getShell(), getParentElement(), ITLDConstants.URI_JSF_CORE,
- IJSFConstants.TAG_VALUECHANGELISTENER, new String[] { IJSFConstants.ATTR_TYPE});
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/DeleteHColumnHeaderFooterAction.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/DeleteHColumnHeaderFooterAction.java
deleted file mode 100644
index 8d6fa01..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/DeleteHColumnHeaderFooterAction.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.actions;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jst.pagedesigner.jsf.ui.elementedit.request.DeleteHColumnHeaderFooterRequest;
-
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class DeleteHColumnHeaderFooterAction extends Action
-{
- private Command _command;
-
- /**
- * @param text
- * @param editPart
- * @param isHeader
- */
- public DeleteHColumnHeaderFooterAction(String text, EditPart editPart, boolean isHeader)
- {
- super(text);
- DeleteHColumnHeaderFooterRequest req = new DeleteHColumnHeaderFooterRequest(text, isHeader);
- this._command = editPart.getCommand(req);
- this.setEnabled(this._command != null && this._command.canExecute());
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.Action#run()
- */
- public void run()
- {
- _command.execute();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/DeleteHeaderFooterAction.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/DeleteHeaderFooterAction.java
deleted file mode 100644
index 7df470c..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/DeleteHeaderFooterAction.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.actions;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jst.pagedesigner.jsf.ui.elementedit.request.DeleteHeaderFooterRequest;
-
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class DeleteHeaderFooterAction extends Action
-{
- private Command _command;
-
- /**
- * @param text
- * @param editPart
- * @param isHeader
- */
- public DeleteHeaderFooterAction(String text, EditPart editPart, boolean isHeader)
- {
- super(text);
- DeleteHeaderFooterRequest req = new DeleteHeaderFooterRequest(text, isHeader);
- this._command = editPart.getCommand(req);
- this.setEnabled(this._command != null && this._command.canExecute());
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.Action#run()
- */
- public void run()
- {
- _command.execute();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/ExpressionAction.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/ExpressionAction.java
deleted file mode 100644
index 3204dca..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/ExpressionAction.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.actions;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jst.pagedesigner.jsf.ui.JSFUIPlugin;
-import org.eclipse.jst.pagedesigner.jsp.core.pagevar.IPageVariablesProvider;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class ExpressionAction extends Action
-{
- /**
- * enumerates a method-binding expression
- */
- public static final int METHOD = 0;
- /**
- * enumerates a value-binding expression
- */
- public static final int VARIABLE = 1;
-
- private String _action;
- private IProject _project;
- private IFile _file;
-
-
- /**
- * @param attribute
- */
- public void setActionValue(String attribute)
- {
- _action = attribute;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.IAction#isEnabled()
- */
- public boolean isEnabled()
- {
- return _project != null && isExpression();
- }
-
- private boolean isExpression()
- {
- boolean flag = false;
- if (_action != null)
- {
- flag = _action.startsWith("#{") && _action.endsWith("}");//$NON-NLS-1$ $NON-NLS-2$
- }
- return flag;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.IAction#run()
- */
- public void run()
- {
- IPageVariablesProvider pageVarProvider = (IPageVariablesProvider) getPage().getActiveEditor().getAdapter(
- IPageVariablesProvider.class);
- pageVarProvider.refresh();
-
- JSFUIPlugin.getAlerts().warning("Message.Warning.Title", "Message.Warning.InvalidateExpression");//$NON-NLS-1$ $NON-NLS-2$
- }
-
- /**
- * @param projectFor
- */
- public void setProject(IProject projectFor)
- {
- this._project = projectFor;
- }
-
- private IWorkbenchPage getPage()
- {
- IWorkbench workbench = PlatformUI.getWorkbench();
- IWorkbenchWindow window = workbench.getActiveWorkbenchWindow();
- return window.getActivePage();
- }
-
- /**
- * @param fileFor
- */
- public void setFile(IFile fileFor)
- {
- _file = fileFor;
- }
-
- /**
- * @return the file
- */
- public IFile getFile()
- {
- return _file;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/IJSFCoreSupport.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/IJSFCoreSupport.java
deleted file mode 100644
index 70285ee..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/IJSFCoreSupport.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.actions;
-
-/**
- * This interface is to provide information of how to enable/disable add
- * jsf core sub element.
- *
- * As other JSF taglibs that we don't know today may also use jsf core tags inside
- * them, so we may also enable the actions for adding jsf core tags to them. But
- * we need check whether individual JSF core tags are supported.
- *
- * @author mengbo
- * @version 1.5
- */
-public interface IJSFCoreSupport
-{
- /**
- * actionListener can only be added to those ActionSource component.
- * @return if is an action source
- */
- public boolean isActionSource();
-
- /**
- *
- * @return true if is a UI component
- */
- public boolean isUIComponent();
-
- /**
- * converter (convertXXX) can only be added to those ValueHolder
- * @return true if is a value holder
- */
- public boolean isValueHolder();
-
- /**
- * validator can only be added to EditableValueHolder
- * @return true if is an editable value holder
- */
- public boolean isEditableValueHolder();
-
- /**
- * whether support selectItem and selectItems
- * @return true if supports the UISelectItem(s) contract
- */
- public boolean supportSelectItems();
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/InsertHColumnHeaderFooterAction.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/InsertHColumnHeaderFooterAction.java
deleted file mode 100644
index e177212..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/InsertHColumnHeaderFooterAction.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.actions;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jst.pagedesigner.jsf.ui.elementedit.request.InsertHColumnHeaderFooterRequest;
-
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class InsertHColumnHeaderFooterAction extends Action
-{
- private Command _command;
-
- /**
- * @param text
- * @param editPart
- * @param isHeader
- */
- public InsertHColumnHeaderFooterAction(String text, EditPart editPart, boolean isHeader)
- {
- super(text);
-
- InsertHColumnHeaderFooterRequest req = new InsertHColumnHeaderFooterRequest(text, isHeader);
- this._command = editPart.getCommand(req);
- this.setEnabled(this._command != null && this._command.canExecute());
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.Action#run()
- */
- public void run()
- {
- _command.execute();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/InsertHeaderFooterAction.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/InsertHeaderFooterAction.java
deleted file mode 100644
index f2ac6b8..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/InsertHeaderFooterAction.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.actions;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jst.pagedesigner.jsf.ui.elementedit.request.InsertHeaderFooterRequest;
-
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class InsertHeaderFooterAction extends Action
-{
- private Command _command;
-
- /**
- * @param text
- * @param editPart
- * @param isHeader
- */
- public InsertHeaderFooterAction(String text, EditPart editPart, boolean isHeader)
- {
- super(text);
-
- InsertHeaderFooterRequest req = new InsertHeaderFooterRequest(text, isHeader);
- this._command = editPart.getCommand(req);
- this.setEnabled(this._command != null && this._command.canExecute());
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.Action#run()
- */
- public void run()
- {
- _command.execute();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/JSFAddActionGroup.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/JSFAddActionGroup.java
deleted file mode 100644
index bd2ed89..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/JSFAddActionGroup.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.actions;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jst.jsf.core.jsfappconfig.JSFAppConfigManager;
-import org.eclipse.jst.jsf.facesconfig.emf.ConverterIdType;
-import org.eclipse.jst.jsf.facesconfig.emf.ConverterType;
-import org.eclipse.jst.jsf.facesconfig.emf.ValidatorIdType;
-import org.eclipse.jst.jsf.facesconfig.emf.ValidatorType;
-import org.eclipse.jst.pagedesigner.editors.PageDesignerActionConstants;
-import org.eclipse.jst.pagedesigner.utils.StructuredModelUtil;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class JSFAddActionGroup {
-
- private final static Action EMPTY_ACTION = new Action() {
- // TODO: why?
- };
-
-
- /**
- * @param menu
- * @param element
- * @param support
- */
- public void fillContextMenu(IMenuManager menu, final IDOMElement element,
- final IJSFCoreSupport support) {
- IContributionItem item = menu.find(PageDesignerActionConstants.INSERT_SUBMENU_ID);
-
- if (item instanceof IMenuManager)
- {
- final IMenuManager submenu = (IMenuManager) item;
- submenu.add(EMPTY_ACTION);
- submenu.addMenuListener(new IMenuListener() {
- public void menuAboutToShow(IMenuManager manager) {
- submenu.removeAll();
- addJSFAddItems(submenu, element, support);
- }
- });
- }
- //menu.appendToGroup(PageDesignerActionConstants.GROUP_SPECIAL, submenu);
- }
-
- /**
- * @param submenu
- * @param element
- */
- private void addJSFAddItems(IMenuManager submenu, IDOMElement element,
- IJSFCoreSupport support) {
- AddActionListenerAction actionListenerAction = new AddActionListenerAction(
- element);
- actionListenerAction.setEnabled(support.isActionSource());
- submenu.add(actionListenerAction);
-
- AddAttributeAction attrAction = new AddAttributeAction(element);
- attrAction.setEnabled(support.isUIComponent());
- submenu.add(attrAction);
-
- IProject prj = null;
- IFile file = StructuredModelUtil.getFileFor(element.getModel());
- if (file != null) {
- prj = file.getProject();
- }
-
- IMenuManager converterMenu = new MenuManager(ActionsResources
- .getString("Submenu.JSFAdd.Converter"));//$NON-NLS-1$
- boolean supportConverter = support.isValueHolder();
- String[] converterIds = getRegisteredConverterIds(prj);
- if (converterIds != null && converterIds.length > 0) {
- for (int i = 0; i < converterIds.length; i++) {
- AddConverterAction action = new AddConverterAction(
- converterIds[i], element);
- action.setEnabled(supportConverter);
- converterMenu.add(action);
- }
- converterMenu.add(new Separator());
- }
- AddConvertDateTimeAction dateTimeAction = new AddConvertDateTimeAction(
- element);
- dateTimeAction.setEnabled(supportConverter);
- converterMenu.add(dateTimeAction);
- AddConvertNumberAction numberAction = new AddConvertNumberAction(
- element);
- numberAction.setEnabled(supportConverter);
- converterMenu.add(numberAction);
- submenu.add(converterMenu);
-
- AddParamAction addParamAction = new AddParamAction(element);
- addParamAction.setEnabled(support.isUIComponent());
- submenu.add(addParamAction);
-
- AddSelectItemAction selectItemAction = new AddSelectItemAction(element);
- selectItemAction.setEnabled(support.supportSelectItems());
- submenu.add(selectItemAction);
-
- AddSelectItemsAction selectItemsAction = new AddSelectItemsAction(
- element);
- selectItemsAction.setEnabled(support.supportSelectItems());
- submenu.add(selectItemsAction);
-
- IMenuManager validatorMenu = new MenuManager(ActionsResources
- .getString("Submenu.JSFAdd.Validators"));//$NON-NLS-1$
- boolean supportValidator = support.isEditableValueHolder();
- String[] validatorIds = getRegisteredValidatorIds(prj);
- if (validatorIds != null && validatorIds.length > 0) {
- for (int i = 0; i < validatorIds.length; i++) {
- AddValidatorAction action = new AddValidatorAction(
- validatorIds[i], element);
- action.setEnabled(supportValidator);
- validatorMenu.add(action);
- }
- validatorMenu.add(new Separator());
- }
- AddValidateDoubleRangeAction doubleRangeAction = new AddValidateDoubleRangeAction(
- element);
- doubleRangeAction.setEnabled(supportValidator);
- validatorMenu.add(doubleRangeAction);
- AddValidateLengthAction lengthAction = new AddValidateLengthAction(
- element);
- lengthAction.setEnabled(supportValidator);
- validatorMenu.add(lengthAction);
- AddValidateLongRangeAction longRangeAction = new AddValidateLongRangeAction(
- element);
- longRangeAction.setEnabled(supportValidator);
- validatorMenu.add(longRangeAction);
- submenu.add(validatorMenu);
-
- AddValueChangeListenerAction valueChangeAction = new AddValueChangeListenerAction(
- element);
- valueChangeAction.setEnabled(support.isEditableValueHolder());
- submenu.add(valueChangeAction);
- }
-
- /**
- * @return
- */
- private String[] getRegisteredValidatorIds(IProject project)
- {
- String[] result = null;
-
- JSFAppConfigManager appConfigMgr =
- JSFAppConfigManager.getInstance(project);
-
- // getInstance may return null if there is a problem
- if (appConfigMgr != null)
- {
- final List list = appConfigMgr.getValidators();
- result = new String[list.size()];
- int i = 0;
- for (final Iterator it = list.iterator(); it.hasNext();)
- {
- ValidatorType validator = (ValidatorType) it.next();
- ValidatorIdType validatorId = validator.getValidatorId();
- if (validatorId != null)
- result[i++] = validatorId.getTextContent().trim();
- }
- }
- return result;
- }
-
- /**
- * @return
- */
- private String[] getRegisteredConverterIds(IProject project)
- {
- String[] result = null;
-
- JSFAppConfigManager appConfigMgr =
- JSFAppConfigManager.getInstance(project);
-
- // getInstance may return null if there is a problem
- if (appConfigMgr != null)
- {
- final List list = appConfigMgr.getConverters();
- result = new String[list.size()];
- int i = 0;
- for (final Iterator it = list.iterator(); it.hasNext();)
- {
- ConverterType converter = (ConverterType) it.next();
- ConverterIdType converterId = converter.getConverterId();
- if (converterId != null)
- result[i++] = converterId.getTextContent().trim();
- }
- }
- return result;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/JSFAddChildAction.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/JSFAddChildAction.java
deleted file mode 100644
index 058f67e..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/JSFAddChildAction.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.actions;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-
-/**
- * Classes in this package are related to JSF operation.
- *
- * @author mengbo
- * @version 1.5
- */
-public class JSFAddChildAction extends Action
-{
- private IDOMElement _parentEle;
-
- /**
- * @param text
- * @param parentNode
- */
- public JSFAddChildAction(String text, IDOMElement parentNode)
- {
- super(text);
- this._parentEle = parentNode;
- }
-
- /**
- * @return the parent element
- */
- public IDOMElement getParentElement()
- {
- return _parentEle;
- }
-
- /**
- * @return the active shell
- */
- public Shell getShell()
- {
- IWorkbench bench = PlatformUI.getWorkbench();
- if (bench != null)
- {
- IWorkbenchWindow window = bench.getActiveWorkbenchWindow();
- if (window == null)
- {
- IWorkbenchWindow[] windows = bench.getWorkbenchWindows();
- if (windows != null && windows.length > 0)
- {
- window = windows[0];
- }
- }
- if (window != null)
- {
- return window.getShell();
- }
- }
-
- return null;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/JSFCommandLinkCreator.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/JSFCommandLinkCreator.java
deleted file mode 100644
index 41d0a3a..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/JSFCommandLinkCreator.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.actions;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.gef.EditPart;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.Text;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.actions.link.AbstractLinkCreator;
-import org.eclipse.jst.pagedesigner.actions.link.LinkUtil;
-import org.eclipse.jst.pagedesigner.parts.TextEditPart;
-import org.eclipse.jst.pagedesigner.utils.JSPUtil;
-import org.eclipse.jst.pagedesigner.utils.StructuredModelUtil;
-import org.eclipse.jst.pagedesigner.viewer.DesignPosition;
-import org.eclipse.jst.pagedesigner.viewer.DesignRange;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class JSFCommandLinkCreator extends AbstractLinkCreator
-{
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.actions.link.ILinkCreator#makeLinkElement(org.eclipse.gef.EditPart, org.eclipse.jst.pagedesigner.viewer.DesignRange)
- */
- public Element makeLinkElement(EditPart part, DesignRange range)
- {
- if (part instanceof TextEditPart)
- {
- Text middleNode = LinkUtil.splitDomText(part, range);
- EditPart parent = part.getParent();
- Node parentNode = (Node) parent.getModel();
- Document doc = (parentNode instanceof Document) ? (Document) parentNode : (parentNode.getOwnerDocument());
-
- IDOMModel model = ((IDOMNode) parentNode).getModel();
- String prefix = JSPUtil.getOrCreatePrefix(model, ITLDConstants.URI_JSF_HTML, "h");
- JSPUtil.getOrCreatePrefix(model, ITLDConstants.URI_JSF_CORE, "f");
-
- Element commandLink = doc.createElement(IJSFConstants.TAG_COMMANDLINK);
- commandLink.setPrefix(prefix);
- Element outputText = doc.createElement(IJSFConstants.TAG_OUTPUTTEXT);
- outputText.setPrefix(prefix);
- outputText.setAttribute(IJSFConstants.ATTR_VALUE, middleNode.getNodeValue());
- commandLink.appendChild(outputText);
-
- parentNode.replaceChild(commandLink, middleNode);
- return commandLink;
- }
-
- return null;
-
- }
-
-
- /**
- * @param range
- * @return true if can execute
- */
- public boolean canExecute(DesignRange range)
- {
- DesignPosition startPosition = range.getStartPosition();
- EditPart part = startPosition.getContainerPart();
- IDOMNode node = (IDOMNode) part.getModel();
- IDOMModel model = node.getModel();
- IFile openedFile = StructuredModelUtil.getFileFor(model);
- boolean canSupportJSF = JSPUtil.supportTaglib(ITLDConstants.URI_JSF_HTML, openedFile);
- if (!canSupportJSF)
- {
- return false;
- }
-
- return super.canExecute(range);
- }
-
- public String getSourcePreview(EditPart part, DesignRange range)
- {
- if (part instanceof TextEditPart)
- {
- TextEditPart textPart = (TextEditPart) part;
- int[] offsets = textPart.getSelectedRange();
-
- String displayData = textPart.getTextData();
- String linkExp = displayData.substring(offsets[0], offsets[1]);
-
- StringBuffer sb = new StringBuffer();
- sb.append("<h:commandLink>\n<h:outputText value=\"");
- sb.append(linkExp);
- sb.append("\">");
- sb.append("</h:outputText>\n</h:commandLink>");
- return sb.toString();
- }
- return null;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/JSFNavigationGroup.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/JSFNavigationGroup.java
deleted file mode 100644
index 4d593e3..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/JSFNavigationGroup.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.actions;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jst.pagedesigner.css2.property.ICSSPropertyID;
-import org.eclipse.jst.pagedesigner.editors.PageDesignerActionConstants;
-import org.eclipse.jst.pagedesigner.jsf.ui.JSFUIPlugin;
-import org.eclipse.jst.pagedesigner.utils.StructuredModelUtil;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class JSFNavigationGroup
-{
- private final static Action EMPTY_ACTION = new Action()
- {
- // TODO: why?
- };
-
-
- /**
- * @param menu
- * @param element
- * @param support
- */
- public void fillContextMenu(IMenuManager menu, final IDOMElement element, final IJSFCoreSupport support)
- {
- final IContributionItem item =
- menu.find(PageDesignerActionConstants.NAVIGATE_SUBMENU_ID);
-
- if (item instanceof IMenuManager)
- {
- final IMenuManager submenu = (IMenuManager) item;
- final IMenuManager javaMenu = new MenuManager(JSFUIPlugin.getResourceString("ElementEdit.Submenu.JavaNavigation"));//$NON-NLS-1$
- javaMenu.add(EMPTY_ACTION);
- javaMenu.addMenuListener(new IMenuListener()
- {
- public void menuAboutToShow(IMenuManager manager)
- {
- javaMenu.removeAll();
- addNavigationItems(javaMenu, element, support);
- }
- }
- );
-
- submenu.appendToGroup(PageDesignerActionConstants.GROUP_NAVIGATE, javaMenu);
- }
- }
-
- private void addNavigationItems(IMenuManager submenu, IDOMElement ele, IJSFCoreSupport support)
- {
- if (support.isActionSource())
- {
- ExpressionAction action = new ExpressionAction();
- action.setText(JSFUIPlugin.getResourceString("ElementEdit.Submenu.JavaNavigation.Action"));//$NON-NLS-1$
- if (ele != null)
- {
- action.setActionValue(ele.getAttribute(ICSSPropertyID.ATTR_ACTION));
- IDOMModel model = ele.getModel();
- action.setProject(StructuredModelUtil.getProjectFor(model));
- action.setFile(StructuredModelUtil.getFileFor(model));
- }
- submenu.add(action);
- }
- if (support.isValueHolder())
- {
- ExpressionAction action = new ExpressionAction();
- action.setText(JSFUIPlugin.getResourceString("ElementEdit.Submenu.JavaNavigation.Value"));//$NON-NLS-1$
- if (ele != null)
- {
- action.setActionValue(ele.getAttribute(ICSSPropertyID.ATTR_VALUE));
- IDOMModel model = ele.getModel();
- action.setProject(StructuredModelUtil.getProjectFor(model));
- action.setFile(StructuredModelUtil.getFileFor(model));
- }
- submenu.add(action);
- }
-
- {
- ExpressionAction action = new ExpressionAction();
- action.setText(JSFUIPlugin.getResourceString("ElementEdit.Submenu.JavaNavigation.Binding"));//$NON-NLS-1$
- if (ele != null)
- {
- action.setActionValue(ele.getAttribute(ICSSPropertyID.ATTR_BINDING));
- IDOMModel model = ele.getModel();
- action.setProject(StructuredModelUtil.getProjectFor(model));
- action.setFile(StructuredModelUtil.getFileFor(model));
- }
- submenu.add(action);
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/JSFOutputLinkCreator.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/JSFOutputLinkCreator.java
deleted file mode 100644
index 036f445..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/JSFOutputLinkCreator.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.actions;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.gef.EditPart;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.Text;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.actions.link.AbstractLinkCreator;
-import org.eclipse.jst.pagedesigner.actions.link.LinkUtil;
-import org.eclipse.jst.pagedesigner.parts.TextEditPart;
-import org.eclipse.jst.pagedesigner.utils.JSPUtil;
-import org.eclipse.jst.pagedesigner.utils.StructuredModelUtil;
-import org.eclipse.jst.pagedesigner.viewer.DesignPosition;
-import org.eclipse.jst.pagedesigner.viewer.DesignRange;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class JSFOutputLinkCreator extends AbstractLinkCreator
-{
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.actions.link.ILinkCreator#makeLinkElement(org.eclipse.gef.EditPart, org.eclipse.jst.pagedesigner.viewer.DesignRange)
- */
- public Element makeLinkElement(EditPart part, DesignRange range)
- {
- if (part instanceof TextEditPart)
- {
- Text middleNode = LinkUtil.splitDomText(part, range);
- EditPart parent = part.getParent();
- Node parentNode = (Node) parent.getModel();
- Document doc = (parentNode instanceof Document) ? (Document) parentNode : (parentNode.getOwnerDocument());
-
- IDOMModel model = ((IDOMNode) parentNode).getModel();
- String prefix = JSPUtil.getOrCreatePrefix(model, ITLDConstants.URI_JSF_HTML, "h");
- String fPrefix = JSPUtil.getOrCreatePrefix(model, ITLDConstants.URI_JSF_CORE, "f");
-
- Element outputLink = doc.createElement(IJSFConstants.TAG_OUTPUTLINK);
- outputLink.setPrefix(prefix);
- Element verbatim = doc.createElement(IJSFConstants.TAG_VERBATIM);
- verbatim.setPrefix(fPrefix);
- Text value = doc.createTextNode(middleNode.getNodeValue());
- verbatim.appendChild(value);
- outputLink.appendChild(verbatim);
-
- parentNode.replaceChild(outputLink, middleNode);
- return outputLink;
- }
-
- return null;
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.actions.link.AbstractLinkCreator#canExecute(org.eclipse.jst.pagedesigner.viewer.DesignRange)
- */
- public boolean canExecute(DesignRange range)
- {
- DesignPosition startPosition = range.getStartPosition();
- EditPart part = startPosition.getContainerPart();
- IDOMNode node = (IDOMNode) part.getModel();
- IDOMModel model = node.getModel();
- IFile openedFile = StructuredModelUtil.getFileFor(model);
- if (openedFile == null)
- {
- return false;
- }
- boolean canSupportJSF = JSPUtil.supportTaglib(ITLDConstants.URI_JSF_HTML, openedFile);
- if (!canSupportJSF)
- {
- return false;
- }
-
- return super.canExecute(range);
- }
-
- public String getSourcePreview(EditPart part, DesignRange range)
- {
- if (part instanceof TextEditPart)
- {
- TextEditPart textPart = (TextEditPart) part;
- int[] offsets = textPart.getSelectedRange();
- String displayData = textPart.getTextData();
- String linkExp = displayData.substring(offsets[0], offsets[1]);
-
- StringBuffer sb = new StringBuffer();
- sb.append("<h:outputLink>\n<f:verbatim>");
- sb.append(linkExp);
- sb.append("</f:verbatim>\n</h:outputLink>");
- return sb.toString();
- }
- return null;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/PageFlowContributor.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/PageFlowContributor.java
deleted file mode 100644
index 293965d..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/PageFlowContributor.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.actions;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jst.pagedesigner.editors.PageDesignerActionConstants;
-import org.eclipse.jst.pagedesigner.extensionpoint.IContextMenuItemContributor;
-import org.eclipse.jst.pagedesigner.jsf.ui.JSFUIPlugin;
-import org.eclipse.jst.pagedesigner.utils.StructuredModelUtil;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class PageFlowContributor implements IContextMenuItemContributor
-{
- private String _uri;
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.extensionpoint.IContextMenuItemContributor#setURI(java.lang.String)
- */
- public void setURI(String uri)
- {
- this._uri = uri;
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.extensionpoint.IContextMenuItemContributor#getURI()
- */
- public String getURI()
- {
- return _uri;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.extensionpoint.IContextMenuItemContributor#setModel(org.eclipse.wst.sse.core.internal.provisional.IStructuredModel)
- */
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.extensionpoint.IContextMenuItemContributor#fillContextMenu(org.eclipse.jface.action.IMenuManager)
- */
- public void fillContextMenu(IMenuManager manager, ISelection selection, IStructuredModel model, Control parentUI)
- {
- PageFlowAction action = new PageFlowAction();
- action.setId(PageFlowAction.ID);
- action.setModel(model);
- IMenuManager viewMgr = manager.findMenuUsingPath(PageDesignerActionConstants.SHOWVIEW_SUBMENU_ID);
- if (viewMgr != null)
- {
- viewMgr.add(action);
- }
- else
- {
- manager.appendToGroup(IWorkbenchActionConstants.MB_ADDITIONS, action);
- }
- }
-
- private static class PageFlowAction extends Action
- {
- /**
- * this action's id
- */
- public final static String ID = "org.eclipse.jst.pagedesigner.jsf.ui.actions.PageFlowAction"; //$NON-NLS-1$
- private IStructuredModel model;
-
- /**
- * construct the action
- */
- public PageFlowAction()
- {
- setText(ActionsResources.getString("PageFlowContributor.Menu.PageFlow"));//$NON-NLS-1$
- }
-
- /**
- * @param model
- */
- public void setModel(IStructuredModel model)
- {
- this.model = model;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.IAction#run()
- */
- public void run()
- {
- IFile file = StructuredModelUtil.getFileFor(model);
- if (file != null)
- {
- try
- {
- // FacesConfigUtil.locateJSPFile(file);
- }
- catch (IllegalArgumentException e)
- {
- JSFUIPlugin.getAlerts().warning("Message.Warning.Title", e.getLocalizedMessage());//$NON-NLS-1$
- }
- }
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/attributegroup/AttributeData.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/attributegroup/AttributeData.java
deleted file mode 100644
index b13fa30..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/attributegroup/AttributeData.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.attributegroup;
-
-import java.util.HashMap;
-
-/**
- * Information and value about a tag attribute
- * @author mengbo
- * @version 1.5
- */
-class AttributeData
-{
- /**
- * possible key in the param map
- */
- static final String SuperType = "superTyle";
- /**
- * possible key in the param map
- */
- static final String Project = "project";
-
- private final String uri;
- private final String elementName;
- private final String attributeName;
- private Object value;
- private HashMap paramMap; // null; lazy initialized
-
- /**
- * @param uri
- * @param elementName
- * @param name
- */
- public AttributeData(String uri,String elementName,String name)
- {
- this.uri = uri;
- this.attributeName = name;
- this.elementName = elementName;
- }
-
- /**
- * @return the uri
- */
- public String getUri() {
- return uri;
- }
-
- /**
- * @return the element name
- */
- public String getElementName() {
- return elementName;
- }
-
- /**
- * @return the attribute name
- */
- public String getAttributeName() {
- return attributeName;
- }
-
- /**
- * @return the value
- */
- public Object getValue() {
- return value;
- }
-
- /**
- * @param value
- */
- public void setValue(Object value) {
- this.value = value;
- }
-
- /**
- * @return the param map
- */
- public HashMap getParamMap()
- {
- if (paramMap == null)
- {
- paramMap = new HashMap();
- }
- return paramMap;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/attributegroup/CommonDialogFieldGroup.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/attributegroup/CommonDialogFieldGroup.java
deleted file mode 100644
index 7959d70..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/attributegroup/CommonDialogFieldGroup.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.attributegroup;
-
-import java.util.HashMap;
-
-import org.eclipse.core.runtime.IStatus;
-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.ui.forms.widgets.FormToolkit;
-
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogFieldGroup;
-
-/**
- * @author mengbo
- * @version 1.5
- * @TODO - unused now?
- */
-public class CommonDialogFieldGroup extends DialogFieldGroup
-{
- private HashMap map = new HashMap();
- private AttributeData[] attributeData = null;
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogFieldGroup#initialize()
- */
- public void initialize()
- {
- if (attributeData != null)
- {
- for (int i = 0; i < attributeData.length; i++)
- {
- DialogField filed = DialogFieldFactory.getDialogField(attributeData[i]);
- filed.setDialogFieldChangeListener(getDefaultChangeListener());
- map.put(attributeData[i], filed);
- }
- }
- }
-
- /**
- * prepare the dialog field data
- */
- public void prepareData()
- {
- if (attributeData != null)
- {
- for (int i = 0; i < attributeData.length; i++)
- {
- DialogField field = (DialogField) map.get(attributeData[i]);
- DialogFieldFactory.prepareDialogFieldValue(field, attributeData[i]);
- }
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogFieldGroup#refreshData()
- */
- public void refreshData()
- {
- if (attributeData != null)
- {
- for (int i = 0; i < attributeData.length; i++)
- {
- DialogField field = (DialogField) map.get(attributeData[i]);
- DialogFieldFactory.setDialogFieldValue(field, attributeData[i].getValue());
- }
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogFieldGroup#layoutDialogFields(org.eclipse.ui.forms.widgets.FormToolkit, org.eclipse.swt.widgets.Composite)
- */
- public void layoutDialogFields(FormToolkit toolkit, Composite parent)
- {
- GridData data = new GridData(GridData.FILL_BOTH);
- parent.setLayoutData(data);
-
- GridLayout gl = new GridLayout();
- gl.numColumns = getMaxColumnNum();
- parent.setLayout(gl);
-
- if (attributeData != null)
- {
- for (int i = 0; i < attributeData.length; i++)
- {
- DialogField field = (DialogField) map.get(attributeData[i]);
- Control[] controls = field.doFillIntoGrid(toolkit, parent, gl.numColumns);
- if (controls.length > 1)
- {
- GridData gridData = (GridData) controls[1].getLayoutData();
- if(field.getNumberOfControls() == gl.numColumns)
- {
- gridData.grabExcessHorizontalSpace = true;
- }
- gridData.horizontalAlignment = GridData.FILL;
- }
- field.setLabelText(DialogFieldFactory.getDialogFieldLabel(attributeData[i]));
- }
- }
- }
-
- private int getMaxColumnNum()
- {
- int cols = 0;
- if (attributeData != null)
- {
- for (int i = 0; i < attributeData.length; i++)
- {
- DialogField field = (DialogField) map.get(attributeData[i]);
- int fieldCols = field.getNumberOfControls();
- if (fieldCols > cols)
- {
- cols = fieldCols;
- }
- }
- }
- return cols;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogFieldGroup#validateDialogFields()
- */
- public IStatus[] validateDialogFields()
- {
- // TODO Now we let it be.
- return null;
- }
-
- /**
- * @return Returns the attributePairs.
- */
- public AttributeData[] getAttributeData()
- {
- return attributeData;
- }
-
- /**
- * @param attributePairs The attributePairs to set.
- */
- public void setAttributeData(AttributeData[] attributePairs)
- {
- this.attributeData = attributePairs;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/attributegroup/CommonDialogFieldWizard.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/attributegroup/CommonDialogFieldWizard.java
deleted file mode 100644
index 03dcb90..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/attributegroup/CommonDialogFieldWizard.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.attributegroup;
-
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogFieldGroupPage;
-import org.eclipse.ui.internal.dialogs.NewWizard;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class CommonDialogFieldWizard extends NewWizard
-{
- DialogFieldGroupPage mainPage;
- /**
- * Constructg a new wizard using page as the wizard mage
- *
- * @param page
- */
- public CommonDialogFieldWizard(DialogFieldGroupPage page)
- {
- this.mainPage = page;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.IWizard#performFinish()
- */
- public boolean performFinish()
- {
- return true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.IWizard#addPages()
- */
- public void addPages()
- {
- addPage(mainPage);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/attributegroup/DialogFieldFactory.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/attributegroup/DialogFieldFactory.java
deleted file mode 100644
index ab8c300..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/attributegroup/DialogFieldFactory.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.attributegroup;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.jsf.common.metadata.Entity;
-import org.eclipse.jst.jsf.common.metadata.Trait;
-import org.eclipse.jst.jsf.common.metadata.internal.TraitValueHelper;
-import org.eclipse.jst.jsf.common.metadata.query.TaglibDomainMetaDataQueryHelper;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.ClassButtonDialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.ComboDialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.RadiosDialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.StringDialogField;
-import org.eclipse.jst.jsf.metadataprocessors.MetaDataEnabledProcessingFactory;
-import org.eclipse.jst.pagedesigner.meta.IAttributeRuntimeValueType;
-
-/**
- * @author mengbo
- * @version 1.5
- * @TODO - unused now
- */
-public class DialogFieldFactory
-{
- /**
- * @param data
- * @return the dialog field for data
- */
- public static DialogField getDialogField(AttributeData data)
- {
- Object project = data.getParamMap().get(AttributeData.Project);
- Entity attrEntity = null;
- if (project instanceof IProject){
- attrEntity = TaglibDomainMetaDataQueryHelper.getEntity(TaglibDomainMetaDataQueryHelper.createMetaDataModelContext((IProject)project, data.getUri()), data.getElementName()+"/"+data.getAttributeName());
- }
-
- if(attrEntity != null)
- {
- Trait t = TaglibDomainMetaDataQueryHelper.getTrait(attrEntity, MetaDataEnabledProcessingFactory.ATTRIBUTE_VALUE_RUNTIME_TYPE_PROP_NAME);
- String type = TraitValueHelper.getValueAsString(t);
- if (IAttributeRuntimeValueType.JAVACLASS.equals(type))
- {
- ClassButtonDialogField field = new ClassButtonDialogField(null);
-// Object project = data.getParamMap().get(AttributeData.Project);
- if (project instanceof IProject)
- {
- field.setProject((IProject) project);
- }
- Object superType = data.getParamMap().get(AttributeData.SuperType);
- field.setSuperClassName((String) superType);
- return field;
- }
- }
- return new StringDialogField();
- }
-
- /**
- * Sets the initial value of dialog field
- * @param field
- * @param value
- */
- public static void setDialogFieldValue(DialogField field, Object value){
- if (field instanceof StringDialogField)
- {
- ((StringDialogField) field).setTextWithoutUpdate(value == null ? "" : value.toString());//$NON-NLS-1$
- }
- else if (field instanceof ComboDialogField)
- {
- ((ComboDialogField) field).setTextWithoutUpdate(value == null ? "" : value.toString());//$NON-NLS-1$
- }
- else if (field instanceof RadiosDialogField)
- {
- if (value instanceof Integer)
- {
- ((RadiosDialogField) field).setSelectedIndex(((Integer) value).intValue());
- }
- }
- }
-
- /**
- * @param field
- * @param value
- * @deprecated - use setDialogField method
- */
- public static void setDialogFiledValue(DialogField field, Object value)
- {
- setDialogFieldValue(field, value);
- }
-
- /**
- * Sets value of field into AttributeData if it was a StringDialogField
- * @param field
- * @param pair
- */
- public static void prepareDialogFieldValue(DialogField field, AttributeData pair)
- {
- if (field instanceof StringDialogField)
- {
- pair.setValue(((StringDialogField) field).getText());
- }
- }
-
- /**
- * @param field
- * @param pair
- * @deprecated - use prepareDialogFieldValue
- */
- public static void prepareDialogFiledValue(DialogField field, AttributeData pair)
- {
- prepareDialogFieldValue(field, pair);
- }
- /**
- * @param data
- * @return the dialog field label for data
- */
- public static String getDialogFieldLabel(AttributeData data)
- {
- String name = data.getAttributeName();
- int gap = 'a' - 'A';//$NON-NLS-1$ //$NON-NLS-2$
- if(name != null)
- {
- char[] chars = name.toCharArray();
- char[] newChars = new char[chars.length*2];
- if(chars.length > 0)
- {
- newChars[0] = chars[0] >= 'a' ? (char)(chars[0] - gap) : chars[0];//$NON-NLS-1$
- }
- int newPos = 1;
- for(int i=1; i<chars.length; i++,newPos++)
- {
- if(chars[i] >= 'A' && chars[i] <= 'Z')//$NON-NLS-1$ //$NON-NLS-2$
- {
- newChars[newPos++] = ' ';//$NON-NLS-1$
- }
- newChars[newPos] = chars[i];
- }
- char[] labelChars = new char[newPos + 1];
- System.arraycopy(newChars,0,labelChars,0,newPos);
- labelChars[newPos] = ':';//$NON-NLS-1$
- return new String(labelChars);
- }
- return "";//$NON-NLS-1$
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/celleditors/ConverterValidatorIdDialogField.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/celleditors/ConverterValidatorIdDialogField.java
deleted file mode 100644
index ef36d11..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/celleditors/ConverterValidatorIdDialogField.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.celleditors;
-
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.ComboDialogField;
-import org.eclipse.jst.pagedesigner.properties.attrgroup.IElementContextable;
-import org.eclipse.swt.SWT;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-
-/**
- * @author mengbo
- * @version 1.5
- * @deprecated
- */
-public class ConverterValidatorIdDialogField extends ComboDialogField implements IElementContextable
-{
- private String _elementId = "";
-
- /**
- * The default constructor
- */
- public ConverterValidatorIdDialogField()
- {
- super(SWT.NONE);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.properties.attrgroup.IElementContextable#setElementContext(org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode, org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement)
- */
- public void setElementContext(IDOMNode ancester, IDOMElement element)
- {
- setItems(new String[0]);
- }
-
- /**
- * @return the element id
- */
- public String getElementId()
- {
- return _elementId;
- }
-
- /**
- * Set the element id
- *
- * @param elementId
- */
- public void setElementId(String elementId)
- {
- this._elementId = elementId;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/celleditors/JSFAttributeCellEditorFactory.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/celleditors/JSFAttributeCellEditorFactory.java
deleted file mode 100644
index 476a096..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/celleditors/JSFAttributeCellEditorFactory.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.celleditors;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField;
-import org.eclipse.jst.pagedesigner.meta.IAttributeCellEditorFactory;
-import org.eclipse.jst.pagedesigner.meta.IAttributeDescriptor;
-import org.eclipse.jst.pagedesigner.properties.celleditors.LabeledComboBoxCellEditor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.w3c.dom.Element;
-
-/**
- * @author mengbo
- * @version 1.5
- * @deprecated
- */
-public class JSFAttributeCellEditorFactory implements IAttributeCellEditorFactory
-{
- private static final String CONVERTERID = "converterId"; //$NON-NLS-1$
- private static final String VALIDATORID = "validatorId"; //$NON-NLS-1$
-
- /**
- * The constructor
- */
- public JSFAttributeCellEditorFactory()
- {
- super();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.meta.IAttributeCellEditorFactory#createCellEditor(org.eclipse.swt.widgets.Composite, org.eclipse.jst.pagedesigner.meta.IAttributeDescriptor, org.w3c.dom.Element)
- */
- public CellEditor createCellEditor(Composite parent, IAttributeDescriptor attr, Element element)
- {
- String type = attr.getValueType();
-
- if (type.equalsIgnoreCase(CONVERTERID))
- {
- Map map = new HashMap();
- return LabeledComboBoxCellEditor.newInstance(parent, map, SWT.NONE);
- }
- else if (type.equalsIgnoreCase(VALIDATORID))
- {
- Map map = new HashMap();
- return LabeledComboBoxCellEditor.newInstance(parent, map, SWT.NONE);
- }
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.meta.IAttributeCellEditorFactory#createDialogField(org.eclipse.jst.pagedesigner.meta.IAttributeDescriptor, org.w3c.dom.Element, org.w3c.dom.Element)
- */
- public DialogField createDialogField(IAttributeDescriptor attr)
- {
- String type = attr.getValueType();
-
- if (type.equalsIgnoreCase(CONVERTERID))
- {
- ConverterValidatorIdDialogField dialogField = new ConverterValidatorIdDialogField();
- dialogField.setElementId("converter-id");
- dialogField.setRequired(attr.isRequired());
- dialogField.setToolTip(attr.getDescription());
- return dialogField;
- }
- else if (type.equalsIgnoreCase(VALIDATORID))
- {
- ConverterValidatorIdDialogField dialogField = new ConverterValidatorIdDialogField();
- dialogField.setElementId("validator-id");
- dialogField.setRequired(attr.isRequired());
- dialogField.setToolTip(attr.getDescription());
- return dialogField;
- }
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.meta.IAttributeCellEditorFactory#getSupportedValueTypes()
- */
- public String[] getSupportedValueTypes()
- {
- return new String[] { CONVERTERID, VALIDATORID};
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/AddJSFCoreChildCommand.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/AddJSFCoreChildCommand.java
deleted file mode 100644
index 70eec64..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/AddJSFCoreChildCommand.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml;
-
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.w3c.dom.Element;
-
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.commands.DesignerCommand;
-import org.eclipse.jst.pagedesigner.utils.JSPUtil;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class AddJSFCoreChildCommand extends DesignerCommand
-{
- // either use single name/value pair
- private String _attrName;
- private String _attrValue;
- // or use a map.
- private Map _attrMap;
-
- private String _coreChildLocalName;
- private IDOMElement _parent;
-
- /**
- * @param parent
- * @param coreChildLocalName
- * @param attributes
- */
- public AddJSFCoreChildCommand(IDOMElement parent, String coreChildLocalName, Map attributes)
- {
- super("", parent); //$NON-NLS-1$
- StringBuffer buffer = new StringBuffer(CommandResources.getString("AddJSFCoreChildCommand.Label.Add")); //$NON-NLS-1$
- if(coreChildLocalName != null && coreChildLocalName.length() > 0)
- {
- buffer.append(coreChildLocalName.substring(0,1).toUpperCase());
- buffer.append(coreChildLocalName.substring(1));
- }
- setLabel(buffer.toString());
- this._parent = parent;
- this._coreChildLocalName = coreChildLocalName;
- this._attrMap = attributes;
- }
-
- /**
- * @param parent
- * @param coreChildLocalName
- * @param aname
- * @param avalue
- */
- public AddJSFCoreChildCommand(IDOMElement parent, String coreChildLocalName, String aname, String avalue)
- {
- super("", parent); //$NON-NLS-1$
- StringBuffer buffer = new StringBuffer(CommandResources.getString("AddJSFCoreChildCommand.Label.Add")); //$NON-NLS-1$
- if(coreChildLocalName != null && coreChildLocalName.length() > 0)
- {
- buffer.append(coreChildLocalName.substring(0,1).toUpperCase());
- buffer.append(coreChildLocalName.substring(1));
- }
- setLabel(buffer.toString());
- this._parent = parent;
- this._coreChildLocalName = coreChildLocalName;
- this._attrName = aname;
- this._attrValue = avalue;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#doExecute()
- */
- protected void doExecute()
- {
- String prefix = JSPUtil.getOrCreatePrefix(this.getModel(), ITLDConstants.URI_JSF_CORE, "f"); //$NON-NLS-1$
- String tag = _coreChildLocalName;
- Element child = _parent.getOwnerDocument().createElement(tag);
- child.setPrefix(prefix);
- if (_attrMap != null)
- {
- for (Iterator iter = _attrMap.keySet().iterator(); iter.hasNext();)
- {
- String key = (String) iter.next();
- String value = (String) _attrMap.get(key);
-
- child.setAttribute(key, value);
- }
- }
- if (_attrName != null)
- {
- child.setAttribute(_attrName, _attrValue);
- }
-
- _parent.appendChild(child);
- formatNode(child);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#getAfterCommandDesignerSelection()
- */
- protected ISelection getAfterCommandDesignerSelection()
- {
- return toDesignSelection(_parent);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/CommandResources.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/CommandResources.java
deleted file mode 100644
index 11e8976..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/CommandResources.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public final class CommandResources
-{
- private static final String BUNDLE_NAME = "org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml.CommandResources"; //$NON-NLS-1$
-
- private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
- private CommandResources()
- {
- // no external instantiation
- }
-
- /**
- * @param key
- * @return the resource for key or !key! if not found
- */
- public static String getString(String key)
- {
- try
- {
- return RESOURCE_BUNDLE.getString(key);
- }
- catch (MissingResourceException e)
- {
- return '!' + key + '!';
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/CommandResources.properties b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/CommandResources.properties
deleted file mode 100644
index fbcd78b..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/CommandResources.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2006 Oracle 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:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-AddJSFCoreChildCommand.Label.Add=Add
-DataTableDeleteColumnCommand.Label.DeleteColumn=Delete Column
-DataTableDeleteHeaderCommand.Label.DeleteHeader=Delete Header
-DataTableDeleteHeaderCommand.Label.DeleteFooter=Delete Footer
-DataTableInsertColumnCommand.Label.InsertColumn=Insert Column
-DataTableInsertHeaderCommand.Label.InsertHeader=Insert Header
-DataTableInsertHeaderCommand.Label.InsertFooter=Insert Footer
-DataTableInsertColumnHeaderCommand.Label.InsertHeader=Insert Header
-DataTableInsertColumnHeaderCommand.Label.InsertFooter=Insert Footer
-DataTableDeleteColumnHeaderCommand.Label.DeleteColumnHeader=Delete Column Header
-DataTableDeleteColumnHeaderCommand.Label.DeleteColumnFooter=Delete Column Footer
-PanelGridDeleteColumnCommand.Label.DeleteColumn=Delete Column
-PanelGridInsertColumnCommand.Label.InsertColumn=Insert Column
-PanelGridInsertFooterCommand.Label.InsertFooter=Insert Footer
-PanelGridInsertHeaderCommand.Label.InsertHeader=Insert Header
-PanelGridDeleteRowCommand.Label.DeleteRow=Delete Row
-PanelGridInsertRowCommand.Label.InsertRow=Insert Row
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/DataTableDeleteColumnCommand.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/DataTableDeleteColumnCommand.java
deleted file mode 100644
index 12dce24..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/DataTableDeleteColumnCommand.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jst.pagedesigner.commands.DesignerCommand;
-import org.eclipse.jst.pagedesigner.jsf.core.dom.JSFDOMUtil;
-import org.eclipse.jst.pagedesigner.viewer.IHTMLGraphicalViewer;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-
-/**
- * Delete a column from dataTable.
- *
- * @author mengbo
- * @version 1.5
- */
-public class DataTableDeleteColumnCommand extends DesignerCommand
-{
-
- private Element _dataTable;
- private int _index;
-
- /**
- * @param viewer
- * @param dataTable
- * @param columnIndex
- */
- public DataTableDeleteColumnCommand(IHTMLGraphicalViewer viewer, Element dataTable, int columnIndex)
- {
- super(CommandResources.getString("DataTableDeleteColumnCommand.Label.DeleteColumn"), viewer); //$NON-NLS-1$
- this._dataTable = dataTable;
- this._index = columnIndex;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.gef.commands.Command#canExecute()
- */
- public boolean canExecute()
- {
- if (this._index < 0)
- {
- return false;
- }
- return super.canExecute();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#doExecute()
- */
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#doExecute()
- */
- protected void doExecute()
- {
- NodeList children = _dataTable.getChildNodes();
- int index = 0;
- for (int i = 0, size = children.getLength(); i < size; i++)
- {
- Node node = children.item(i);
- if (JSFDOMUtil.isHColumn(node))
- {
- if (index++ == this._index)
- {
- _dataTable.removeChild(node);
- return;
- }
- }
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#getAfterCommandDesignerSelection()
- */
- protected ISelection getAfterCommandDesignerSelection()
- {
- return toDesignSelection(_dataTable);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/DataTableDeleteColumnHeaderCommand.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/DataTableDeleteColumnHeaderCommand.java
deleted file mode 100644
index c16d4eb..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/DataTableDeleteColumnHeaderCommand.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jst.pagedesigner.commands.DesignerCommand;
-import org.eclipse.jst.pagedesigner.jsf.core.dom.JSFDOMUtil;
-import org.eclipse.jst.pagedesigner.viewer.IHTMLGraphicalViewer;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class DataTableDeleteColumnHeaderCommand extends DesignerCommand
-{
- boolean _header; // true means header, false means footer.
- private Element _dataTable;
-
- /**
- * @param viewer
- * @param dataTable
- * @param header
- */
- public DataTableDeleteColumnHeaderCommand(IHTMLGraphicalViewer viewer, Element dataTable, boolean header)
- {
- super(header ? CommandResources.getString("DataTableDeleteColumnHeaderCommand.Label.DeleteColumnHeader") : //$NON-NLS-1$
- CommandResources.getString("DataTableDeleteColumnHeaderCommand.Label.DeleteColumnFooter"), viewer); //$NON-NLS-1$
- this._header = header;
- this._dataTable = dataTable;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.gef.commands.Command#canExecute()
- */
- public boolean canExecute()
- {
- int num = 0;
- NodeList children = _dataTable.getChildNodes();
- for (int i = 0, size = children.getLength(); i < size; i++)
- {
- Node node = children.item(i);
- if (JSFDOMUtil.isHColumn(node))
- {
- Element column = (Element) node;
- if (hasHeader(column))
- {
- num++;
- break;
- }
- }
- }
- if (num == 0)
- {
- return false;
- }
- return super.canExecute();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#doExecute()
- */
- protected void doExecute()
- {
- NodeList children = _dataTable.getChildNodes();
- for (int i = 0, size = children.getLength(); i < size; i++)
- {
- Node node = children.item(i);
- if (JSFDOMUtil.isHColumn(node))
- {
- Element column = (Element) node;
- if (hasHeader(column))
- {
- Element hf = JSFDOMUtil.findFacet(column, _header ? "header" : "footer"); //$NON-NLS-1$ //$NON-NLS-2$
- column.removeChild(hf);
- }
- }
- }
- formatNode(this._dataTable);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#getAfterCommandDesignerSelection()
- */
- protected ISelection getAfterCommandDesignerSelection()
- {
- return toDesignSelection(_dataTable);
- }
-
- /**
- * @param column
- * @param _header2
- * @return
- */
- private boolean hasHeader(Element column)
- {
- return JSFDOMUtil.findFacet(column, _header ? "header" : "footer") != null; //$NON-NLS-1$ //$NON-NLS-2$
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/DataTableDeleteHeaderCommand.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/DataTableDeleteHeaderCommand.java
deleted file mode 100644
index 44dfff2..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/DataTableDeleteHeaderCommand.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jst.pagedesigner.commands.DesignerCommand;
-import org.eclipse.jst.pagedesigner.jsf.core.dom.JSFDOMUtil;
-import org.eclipse.jst.pagedesigner.viewer.IHTMLGraphicalViewer;
-import org.w3c.dom.Element;
-
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class DataTableDeleteHeaderCommand extends DesignerCommand
-{
- /**
- * true means header,false means footer
- */
- boolean _isHeader;
- private Element _dataTable;
-
- /**
- * @param viewer
- * @param dataTable
- * @param isHeader
- */
- public DataTableDeleteHeaderCommand(IHTMLGraphicalViewer viewer, Element dataTable, boolean isHeader)
- {
- super(isHeader ? CommandResources.getString("DataTableDeleteHeaderCommand.Label.DeleteHeader") : //$NON-NLS-1$
- CommandResources.getString("DataTableDeleteHeaderCommand.Label.DeleteFooter"), viewer); //$NON-NLS-1$
- this._isHeader = isHeader;
- this._dataTable = dataTable;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.gef.commands.Command#canExecute()
- */
- public boolean canExecute()
- {
- if (this._isHeader)
- {
- boolean hasHeader = (JSFDOMUtil.findFacet(this._dataTable, "header") != null); //$NON-NLS-1$
- if (!hasHeader)
- {
- return false;
- }
- }
- else
- {
- boolean hasFooter = (JSFDOMUtil.findFacet(this._dataTable, "footer") != null); //$NON-NLS-1$
- if (!hasFooter)
- {
- return false;
- }
- }
- return super.canExecute();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#doExecute()
- */
- protected void doExecute()
- {
- String type = (this._isHeader) ? "header" : "footer"; //$NON-NLS-1$ //$NON-NLS-2$
- Element ele = JSFDOMUtil.findFacet(this._dataTable, type);
- if (ele != null)
- {
- this._dataTable.removeChild(ele);
- }
- formatNode(this._dataTable);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#getAfterCommandDesignerSelection()
- */
- protected ISelection getAfterCommandDesignerSelection()
- {
- return toDesignSelection(_dataTable);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/DataTableInsertColumnCommand.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/DataTableInsertColumnCommand.java
deleted file mode 100644
index b5c7d0c..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/DataTableInsertColumnCommand.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.commands.DesignerCommand;
-import org.eclipse.jst.pagedesigner.jsf.core.dom.JSFDOMUtil;
-import org.eclipse.jst.pagedesigner.utils.JSPUtil;
-import org.eclipse.jst.pagedesigner.viewer.IHTMLGraphicalViewer;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * Insert a column into dataTable.
- *
- * @author mengbo
- * @version 1.5
- */
-public class DataTableInsertColumnCommand extends DesignerCommand
-{
- Element _dataTable;
- Element _child;
- int _index;
-
- /**
- *
- * @param viewer
- * @param dataTable
- * @param index 0 means before the first column.
- */
- public DataTableInsertColumnCommand(IHTMLGraphicalViewer viewer, Element dataTable, int index)
- {
- super(CommandResources.getString("DataTableInsertColumnCommand.Label.InsertColumn"), viewer); //$NON-NLS-1$
- this._dataTable = dataTable;
- this._index = index;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.gef.commands.Command#canExecute()
- */
- public boolean canExecute()
- {
- if (this._index < 0)
- {
- return false;
- }
- return super.canExecute();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#doExecute()
- */
- protected void doExecute()
- {
- String prefix = JSPUtil.getOrCreatePrefix(getModel(), ITLDConstants.URI_JSF_HTML, "h"); //$NON-NLS-1$
- _child = _dataTable.getOwnerDocument().createElement(prefix + ":column"); //$NON-NLS-1$
-
- createHeaderFooter(_child);
- NodeList children = _dataTable.getChildNodes();
- int count = 0;
- for (int i = 0, size = children.getLength(); i < size; i++)
- {
- Node node = children.item(i);
- if (JSFDOMUtil.isHColumn(node))
- {
- if (_index == count)
- {
- _dataTable.insertBefore(_child, node);
- return;
- }
- count++;
- }
- }
- _dataTable.insertBefore(_child, null);
- formatNode(this._child);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#getAfterCommandDesignerSelection()
- */
- protected ISelection getAfterCommandDesignerSelection()
- {
- return toDesignSelection(_dataTable);
- }
-
- /**
- * check whether the datatable already have header and footer, if yes,
- * then also create for this column
- *
- * @param column
- */
- private void createHeaderFooter(Element column)
- {
- boolean hasHeader = false;
- boolean hasFooter = false;
- NodeList children = _dataTable.getChildNodes();
- for (int i = 0, size = children.getLength(); i < size; i++)
- {
- Node node = children.item(i);
- if (JSFDOMUtil.isHColumn(node))
- {
- if (!hasHeader && JSFDOMUtil.findFacet((Element) node, "header") != null) //$NON-NLS-1$
- {
- hasHeader = true;
- }
- if (!hasFooter && JSFDOMUtil.findFacet((Element) node, "footer") != null) //$NON-NLS-1$
- {
- hasFooter = true;
- }
- }
- }
- if (hasHeader)
- {
- Element facet = createFacet();
- facet.setAttribute("name", "header"); //$NON-NLS-1$ //$NON-NLS-2$
- Element ele = createDefaultElement();
- facet.appendChild(ele);
- column.appendChild(facet);
- }
- if (hasFooter)
- {
- Element facet = createFacet();
- facet.setAttribute("name", "footer"); //$NON-NLS-1$ //$NON-NLS-2$
- Element ele = createDefaultElement();
- facet.appendChild(ele);
- column.appendChild(facet);
- }
- }
-
- /**
- * @return
- */
- private Element createFacet()
- {
- String prefix = JSPUtil.getOrCreatePrefix(getModel(), ITLDConstants.URI_JSF_CORE, "f"); //$NON-NLS-1$
- Element ele = _dataTable.getOwnerDocument().createElement(IJSFConstants.TAG_FACET);
- ele.setPrefix(prefix);
- return ele;
- }
-
- private Element createDefaultElement()
- {
- String prefix = JSPUtil.getOrCreatePrefix(getModel(), ITLDConstants.URI_JSF_HTML, "h"); //$NON-NLS-1$
- Element ele = _dataTable.getOwnerDocument().createElement(IJSFConstants.TAG_OUTPUTTEXT);
- ele.setPrefix(prefix);
- ele.setAttribute(IJSFConstants.ATTR_VALUE, "Column"); //$NON-NLS-1$
- return ele;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/DataTableInsertColumnHeaderCommand.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/DataTableInsertColumnHeaderCommand.java
deleted file mode 100644
index f69707f..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/DataTableInsertColumnHeaderCommand.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.commands.DesignerCommand;
-import org.eclipse.jst.pagedesigner.jsf.core.dom.JSFDOMUtil;
-import org.eclipse.jst.pagedesigner.utils.JSPUtil;
-import org.eclipse.jst.pagedesigner.viewer.IHTMLGraphicalViewer;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class DataTableInsertColumnHeaderCommand extends DesignerCommand
-{
- boolean _header; // true means header, false means footer.
- private Element _dataTable;
-
- /**
- * @param viewer
- * @param dataTable
- * @param header
- */
- public DataTableInsertColumnHeaderCommand(IHTMLGraphicalViewer viewer, Element dataTable, boolean header)
- {
- super(header ? CommandResources.getString("DataTableInsertColumnHeaderCommand.Label.InsertHeader") : CommandResources.getString("DataTableInsertColumnHeaderCommand.Label.InsertFooter"), viewer); //$NON-NLS-1$ //$NON-NLS-2$
- this._header = header;
- this._dataTable = dataTable;
- }
-
- public boolean canExecute()
- {
- int num = 0;
- NodeList children = _dataTable.getChildNodes();
- for (int i = 0, size = children.getLength(); i < size; i++)
- {
- Node node = children.item(i);
- if (JSFDOMUtil.isHColumn(node))
- {
- Element column = (Element) node;
- if (!hasHeader(column))
- {
- num++;
- break;
- }
- }
- }
- if (num == 0)
- {
- return false;
- }
- return super.canExecute();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#doExecute()
- */
- protected void doExecute()
- {
- String type = (this._header) ? "header" : "footer"; //$NON-NLS-1$ //$NON-NLS-2$
-
- NodeList children = _dataTable.getChildNodes();
- for (int i = 0, size = children.getLength(); i < size; i++)
- {
- Node node = children.item(i);
- if (JSFDOMUtil.isHColumn(node))
- {
- Element column = (Element) node;
- if (!hasHeader(column))
- {
- Element headerOrFooter = createHeaderOrFooter(type);
- column.appendChild(headerOrFooter);
- }
- }
- }
- formatNode(this._dataTable);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#getAfterCommandDesignerSelection()
- */
- protected ISelection getAfterCommandDesignerSelection()
- {
- return toDesignSelection(_dataTable);
- }
-
- /**
- * @param column
- * @param _header2
- * @return
- */
- private boolean hasHeader(Element column)
- {
- return JSFDOMUtil.findFacet(column, _header ? "header" : "footer") != null; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- private Element createHeaderOrFooter(String type)
- {
- Element facet = createFacet();
- Element def = createDefaultElement();
- facet.appendChild(def);
- facet.setAttribute(IJSFConstants.ATTR_NAME, type);
- return facet;
- }
-
- private Element createFacet()
- {
- String prefix = JSPUtil.getOrCreatePrefix(getModel(), ITLDConstants.URI_JSF_CORE, "f"); //$NON-NLS-1$
- Element ele = _dataTable.getOwnerDocument().createElement(IJSFConstants.TAG_FACET);
- ele.setPrefix(prefix);
- return ele;
- }
-
- private Element createDefaultElement()
- {
- String prefix = JSPUtil.getOrCreatePrefix(getModel(), ITLDConstants.URI_JSF_HTML, "h"); //$NON-NLS-1$
- Element ele = _dataTable.getOwnerDocument().createElement(IJSFConstants.TAG_OUTPUTTEXT);
- ele.setPrefix(prefix);
- if (this._header)
- {
- ele.setAttribute(IJSFConstants.ATTR_VALUE, "Column Header"); //$NON-NLS-1$
- }
- else
- {
- ele.setAttribute(IJSFConstants.ATTR_VALUE, "Column Footer"); //$NON-NLS-1$
- }
-
- return ele;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/DataTableInsertHeaderCommand.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/DataTableInsertHeaderCommand.java
deleted file mode 100644
index 4231efc..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/DataTableInsertHeaderCommand.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.w3c.dom.Element;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.commands.DesignerCommand;
-import org.eclipse.jst.pagedesigner.jsf.core.dom.JSFDOMUtil;
-import org.eclipse.jst.pagedesigner.utils.JSPUtil;
-import org.eclipse.jst.pagedesigner.viewer.IHTMLGraphicalViewer;
-
-/**
- * This command is used to insert a header row or footer row.
- *
- * @author mengbo
- * @version 1.5
- */
-public class DataTableInsertHeaderCommand extends DesignerCommand
-{
- boolean _header; // true means header, false means footer.
- private Element _dataTable;
-
- /**
- * @param viewer
- * @param dataTable
- * @param header
- */
- public DataTableInsertHeaderCommand(IHTMLGraphicalViewer viewer, Element dataTable, boolean header)
- {
- super(header ? CommandResources.getString("DataTableInsertHeaderCommand.Label.InsertHeader") : CommandResources.getString("DataTableInsertHeaderCommand.Label.InsertFooter"), viewer); //$NON-NLS-1$ //$NON-NLS-2$
- this._header = header;
- this._dataTable = dataTable;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.gef.commands.Command#canExecute()
- */
- public boolean canExecute()
- {
- if (this._header)
- {
- boolean hasHeader = (JSFDOMUtil.findFacet(this._dataTable, "header") != null); //$NON-NLS-1$
- if (hasHeader)
- {
- return false;
- }
- }
- else
- {
- boolean hasFooter = (JSFDOMUtil.findFacet(this._dataTable, "footer") != null); //$NON-NLS-1$
- if (hasFooter)
- {
- return false;
- }
- }
- return super.canExecute();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#doExecute()
- */
- protected void doExecute()
- {
- String type = (this._header) ? "header" : "footer"; //$NON-NLS-1$ //$NON-NLS-2$
- Element headerOrFooter = createHeaderOrFooter(type);
- if (this._header)
- {
- this._dataTable.insertBefore(headerOrFooter, this._dataTable.getFirstChild());
- }
- else
- {
- this._dataTable.appendChild(headerOrFooter);
- }
- formatNode(this._dataTable);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#getAfterCommandDesignerSelection()
- */
- protected ISelection getAfterCommandDesignerSelection()
- {
- return toDesignSelection(_dataTable);
- }
-
- private Element createHeaderOrFooter(String type)
- {
- Element facet = createFacet();
- Element def = createDefaultElement();
- facet.appendChild(def);
- facet.setAttribute(IJSFConstants.ATTR_NAME, type);
- return facet;
- }
-
- private Element createFacet()
- {
- String prefix = JSPUtil.getOrCreatePrefix(getModel(), ITLDConstants.URI_JSF_CORE, "f"); //$NON-NLS-1$
- Element ele = _dataTable.getOwnerDocument().createElement(IJSFConstants.TAG_FACET);
- ele.setPrefix(prefix);
- return ele;
- }
-
- private Element createDefaultElement()
- {
- String prefix = JSPUtil.getOrCreatePrefix(getModel(), ITLDConstants.URI_JSF_HTML, "h"); //$NON-NLS-1$
- Element ele = _dataTable.getOwnerDocument().createElement(IJSFConstants.TAG_OUTPUTTEXT);
- ele.setPrefix(prefix);
- if (this._header)
- {
- ele.setAttribute(IJSFConstants.ATTR_VALUE, "Table Header"); //$NON-NLS-1$
- }
- else
- {
- ele.setAttribute(IJSFConstants.ATTR_VALUE, "Table Footer"); //$NON-NLS-1$
- }
- return ele;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/PanelGridDeleteColumnCommand.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/PanelGridDeleteColumnCommand.java
deleted file mode 100644
index a57f4f7..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/PanelGridDeleteColumnCommand.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.viewers.ISelection;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-import org.eclipse.jst.pagedesigner.commands.DesignerCommand;
-import org.eclipse.jst.pagedesigner.jsf.core.dom.JSFDOMUtil;
-import org.eclipse.jst.pagedesigner.jsf.ui.JSFUIPlugin;
-import org.eclipse.jst.pagedesigner.utils.DOMUtil;
-import org.eclipse.jst.pagedesigner.viewer.IHTMLGraphicalViewer;
-
-/**
- * This is for delete a column in panelGrid
- *
- * @author mengbo
- * @version 1.5
- */
-public class PanelGridDeleteColumnCommand extends DesignerCommand
-{
-
- private int _columnIndex;
- private Element _panelGridEle;
-
- /**
- * @param viewer
- * @param panelGrid
- * @param columnIndex
- */
- public PanelGridDeleteColumnCommand(IHTMLGraphicalViewer viewer, Element panelGrid, int columnIndex)
- {
- super(CommandResources.getString("PanelGridDeleteColumnCommand.Label.DeleteColumn"), viewer); //$NON-NLS-1$
- this._panelGridEle = panelGrid;
- this._columnIndex = columnIndex;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.gef.commands.Command#canExecute()
- */
- public boolean canExecute()
- {
- //if user chose header or footer,then disable the delete column action
- if (this._columnIndex < 0)
- {
- return false;
- }
- int columns = DOMUtil.getIntAttributeIgnoreCase(_panelGridEle, "columns", 1); //$NON-NLS-1$
- if (columns < 1)
- {
- columns = 1;
- }
- return columns > 1;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#doExecute()
- */
- protected void doExecute()
- {
- int columns = DOMUtil.getIntAttributeIgnoreCase(_panelGridEle, "columns", 1); //$NON-NLS-1$
- if (columns < 1)
- {
- columns = 1;
- }
-
- if (_columnIndex >= columns)
- {
- JSFUIPlugin.log(IStatus.ERROR, "Should not happen", new Throwable());
- return;
- }
- List children = JSFDOMUtil.getUIComponentChildren(_panelGridEle);
- List toRemove = new ArrayList();
- for (int i = _columnIndex; i < children.size(); i += columns)
- {
- toRemove.add(children.get(i));
- }
- for (int i = 0, size = toRemove.size(); i < size; i++)
- {
- _panelGridEle.removeChild((Node) toRemove.get(i));
- }
-
- _panelGridEle.setAttribute("columns", String.valueOf(columns - 1)); //$NON-NLS-1$
- formatNode(_panelGridEle);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#getAfterCommandDesignerSelection()
- */
- protected ISelection getAfterCommandDesignerSelection()
- {
- return toDesignSelection(this._panelGridEle);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/PanelGridDeleteRowCommand.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/PanelGridDeleteRowCommand.java
deleted file mode 100644
index e0a2795..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/PanelGridDeleteRowCommand.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-import org.eclipse.jst.pagedesigner.commands.DesignerCommand;
-import org.eclipse.jst.pagedesigner.jsf.core.dom.JSFDOMUtil;
-import org.eclipse.jst.pagedesigner.utils.DOMUtil;
-import org.eclipse.jst.pagedesigner.viewer.IHTMLGraphicalViewer;
-
-/**
- * Remove a row from panel grid
- *
- * @author mengbo
- * @version 1.5
- */
-public class PanelGridDeleteRowCommand extends DesignerCommand
-{
- Element _panelGridEle;
- int _rowIndex;
-
- /**
- * @param viewer
- * @param panelGrid
- * @param index
- */
- public PanelGridDeleteRowCommand(IHTMLGraphicalViewer viewer, Element panelGrid, int index)
- {
- super(CommandResources.getString("PanelGridDeleteRowCommand.Label.DeleteRow"), viewer); //$NON-NLS-1$
- this._panelGridEle = panelGrid;
- this._rowIndex = index;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#doExecute()
- */
- protected void doExecute()
- {
- // Remove the row from panelGrid is a little complex. Since this row could
- // be header or footer.
- boolean hasHeaderRow = (JSFDOMUtil.findFacet(_panelGridEle, "header") != null); //$NON-NLS-1$
-
- int columns = DOMUtil.getIntAttributeIgnoreCase(_panelGridEle, "columns", 1); //$NON-NLS-1$
- if (columns < 1)
- {
- columns = 1;
- }
-
- List children = JSFDOMUtil.getUIComponentChildren(_panelGridEle);
- int numRows = (children.size() + columns - 1) / columns;
-
- int removeRow = _rowIndex;
-
- if (hasHeaderRow)
- {
- if (removeRow == 0)
- {
- // remove the header row.
- removeHeader();
- formatNode(_panelGridEle);
- return;
- }
- removeRow--;
- }
- if (removeRow < numRows)
- {
- List toRemove = new ArrayList();
- int max = columns * (removeRow + 1);
- max = Math.min(max, children.size());
- for (int i = (columns * removeRow); i < max; i++)
- {
- toRemove.add(children.get(i));
- }
- for (int i = 0, size = toRemove.size(); i < size; i++)
- {
- _panelGridEle.removeChild((Node) toRemove.get(i));
- }
- formatNode(_panelGridEle);
- }
- else
- {
- // must be footer.
- removeFooter();
- formatNode(_panelGridEle);
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.gef.commands.Command#canExecute()
- */
- public boolean canExecute()
- {
- if (this._rowIndex < 0)
- {
- return false;
- }
- return super.canExecute();
- }
-
- /**
- *
- */
- private void removeFooter()
- {
- Element ele = JSFDOMUtil.findFacet(_panelGridEle, "footer"); //$NON-NLS-1$
- if (ele != null)
- {
- _panelGridEle.removeChild(ele);
- }
- }
-
- /**
- *
- */
- private void removeHeader()
- {
- Element ele = JSFDOMUtil.findFacet(_panelGridEle, "header"); //$NON-NLS-1$
- if (ele != null)
- {
- _panelGridEle.removeChild(ele);
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#getAfterCommandDesignerSelection()
- */
- protected ISelection getAfterCommandDesignerSelection()
- {
- return this.toDesignSelection(this._panelGridEle);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/PanelGridInsertColumnCommand.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/PanelGridInsertColumnCommand.java
deleted file mode 100644
index 3c68d26..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/PanelGridInsertColumnCommand.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.commands.DesignerCommand;
-import org.eclipse.jst.pagedesigner.jsf.core.dom.JSFDOMUtil;
-import org.eclipse.jst.pagedesigner.jsf.ui.elementedit.util.PanelGridUtil;
-import org.eclipse.jst.pagedesigner.utils.DOMUtil;
-import org.eclipse.jst.pagedesigner.utils.JSPUtil;
-import org.eclipse.jst.pagedesigner.viewer.IHTMLGraphicalViewer;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class PanelGridInsertColumnCommand extends DesignerCommand
-{
- private int _columnIndex;
- private Element _panelGridEle;
-
- /**
- * construction
- * @param viewer
- * @param panelGrid
- * @param columnIndex
- */
- public PanelGridInsertColumnCommand(IHTMLGraphicalViewer viewer, Element panelGrid, int columnIndex)
- {
- super(CommandResources.getString("PanelGridInsertColumnCommand.Label.InsertColumn"), viewer); //$NON-NLS-1$
- this._panelGridEle = panelGrid;
- this._columnIndex = columnIndex;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.gef.commands.Command#canExecute()
- */
- public boolean canExecute()
- {
- if (this._columnIndex < 0)
- {
- return false;
- }
- return super.canExecute();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#doExecute()
- */
- protected void doExecute()
- {
- int columns = DOMUtil.getIntAttributeIgnoreCase(_panelGridEle, IJSFConstants.ATTR_COLUMNS, 1);
- if (columns < 1)
- {
- columns = 1;
- }
-
- int startPoint = 0;
- if (_columnIndex > columns)
- {
- return;
- }
- else if (_columnIndex == columns)
- {
- startPoint = _columnIndex - 1;
- }
- else
- {
- startPoint = _columnIndex;
- }
-
- List children = JSFDOMUtil.getUIComponentChildren(_panelGridEle);
-
- List toMove = new ArrayList();
- for (int i = startPoint; i < children.size(); i += columns)
- {
- if (_columnIndex < columns)
- {
- toMove.add(children.get(i));
- }
- else
- {
- int tmp = i + 1;
- if (tmp == children.size())
- {
- toMove.add(null);
- }
- else
- {
- toMove.add(children.get(i + 1));
- }
- }
- }
- // for (int i = 0, size = toMove.size(); i < size; i++)
- int lastRowCells = (children.size() % columns == 0) ? columns : (children.size() % columns);
- PanelGridUtil util = new PanelGridUtil(this._panelGridEle);
- int uiRows = util.getUIRowCount();
- int adds = uiRows;
- if (this._columnIndex > lastRowCells)
- {
- adds += this._columnIndex - lastRowCells;
- }
- for (int i = 0, size = adds; i < size; i++)
- {
- Node child = createDefaultNode();
- int toMoveSize = toMove.size();
- Node node = null;
- if (i < toMoveSize)
- {
- node = (Node) toMove.get(i);
- }
- _panelGridEle.insertBefore(child, node);
- }
-
- _panelGridEle.setAttribute(IJSFConstants.ATTR_COLUMNS, String.valueOf(columns + 1));
- formatNode(_panelGridEle);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#getAfterCommandDesignerSelection()
- */
- protected ISelection getAfterCommandDesignerSelection()
- {
- return toDesignSelection(this._panelGridEle);
- }
-
- private Node createDefaultNode()
- {
- String prefix = JSPUtil.getOrCreatePrefix(getModel(), ITLDConstants.URI_JSF_HTML, "h"); //$NON-NLS-1$
- Element child = _panelGridEle.getOwnerDocument().createElement(IJSFConstants.TAG_OUTPUTTEXT);
- child.setPrefix(prefix);
- return child;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/PanelGridInsertFooterCommand.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/PanelGridInsertFooterCommand.java
deleted file mode 100644
index d3cb109..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/PanelGridInsertFooterCommand.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml;
-
-import java.util.List;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.commands.DesignerCommand;
-import org.eclipse.jst.pagedesigner.jsf.core.dom.JSFDOMUtil;
-import org.eclipse.jst.pagedesigner.viewer.IHTMLGraphicalViewer;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class PanelGridInsertFooterCommand extends DesignerCommand
-{
- private Element _panelGrid;
-
- /**
- * @param viewer
- * @param panelGrid
- */
- public PanelGridInsertFooterCommand(IHTMLGraphicalViewer viewer, Element panelGrid)
- {
- super(CommandResources.getString("PanelGridInsertFooterCommand.Label.InsertFooter"), viewer); //$NON-NLS-1$
- this._panelGrid = panelGrid;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.gef.commands.Command#canExecute()
- */
- public boolean canExecute()
- {
- boolean hasHeader = (JSFDOMUtil.findFacet(this._panelGrid, "footer") != null); //$NON-NLS-1$
- if (hasHeader)
- {
- return false;
- }
- return super.canExecute();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#doExecute()
- */
- protected void doExecute()
- {
- Document doc = this._panelGrid.getOwnerDocument();
- Element facet = doc.createElement(IJSFConstants.TAG_FACET);
- facet.setPrefix("f"); //$NON-NLS-1$
- facet.setAttribute(IJSFConstants.ATTR_NAME, "footer"); //$NON-NLS-1$
- Element outputText = doc.createElement(IJSFConstants.TAG_OUTPUTTEXT);
- outputText.setPrefix("h"); //$NON-NLS-1$
- outputText.setAttribute(IJSFConstants.ATTR_VALUE, "Footer"); //$NON-NLS-1$
- facet.appendChild(outputText);
- List list = JSFDOMUtil.getUIComponentChildren(this._panelGrid);
- if (list != null && list.size() > 0)
- {
- this._panelGrid.insertBefore(facet, (Element) list.get(0));
- }
- else
- {
- this._panelGrid.insertBefore(facet, null);
- }
- formatNode(this._panelGrid);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#getAfterCommandDesignerSelection()
- */
- protected ISelection getAfterCommandDesignerSelection()
- {
- return toDesignSelection(this._panelGrid);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/PanelGridInsertHeaderCommand.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/PanelGridInsertHeaderCommand.java
deleted file mode 100644
index 6a9753d..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/PanelGridInsertHeaderCommand.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.commands.DesignerCommand;
-import org.eclipse.jst.pagedesigner.jsf.core.dom.JSFDOMUtil;
-import org.eclipse.jst.pagedesigner.viewer.IHTMLGraphicalViewer;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class PanelGridInsertHeaderCommand extends DesignerCommand
-{
- private Element _panelGrid;
-
- /**
- * @param viewer
- * @param panelGrid
- */
- public PanelGridInsertHeaderCommand(IHTMLGraphicalViewer viewer, Element panelGrid)
- {
- super(CommandResources.getString("PanelGridInsertHeaderCommand.Label.InsertHeader"), viewer); //$NON-NLS-1$
- this._panelGrid = panelGrid;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.gef.commands.Command#canExecute()
- */
- public boolean canExecute()
- {
- boolean hasHeader = (JSFDOMUtil.findFacet(this._panelGrid, "header") != null); //$NON-NLS-1$
- if (hasHeader)
- {
- return false;
- }
- return super.canExecute();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#doExecute()
- */
- protected void doExecute()
- {
- Document doc = this._panelGrid.getOwnerDocument();
- Element facet = doc.createElement(IJSFConstants.TAG_FACET);
- facet.setPrefix("f"); //$NON-NLS-1$
- facet.setAttribute(IJSFConstants.ATTR_NAME, "header"); //$NON-NLS-1$
- Element outputText = doc.createElement(IJSFConstants.TAG_OUTPUTTEXT);
- outputText.setPrefix("h"); //$NON-NLS-1$
- outputText.setAttribute(IJSFConstants.ATTR_VALUE, "Header"); //$NON-NLS-1$
- facet.appendChild(outputText);
- this._panelGrid.insertBefore(facet, this._panelGrid.getFirstChild());
- formatNode(this._panelGrid);
- }
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#getAfterCommandDesignerSelection()
- */
- protected ISelection getAfterCommandDesignerSelection()
- {
- return toDesignSelection(this._panelGrid);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/PanelGridInsertRowCommand.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/PanelGridInsertRowCommand.java
deleted file mode 100644
index 8971b2c..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/PanelGridInsertRowCommand.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml;
-
-import java.util.List;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.commands.DesignerCommand;
-import org.eclipse.jst.pagedesigner.jsf.core.dom.JSFDOMUtil;
-import org.eclipse.jst.pagedesigner.utils.DOMUtil;
-import org.eclipse.jst.pagedesigner.utils.JSPUtil;
-import org.eclipse.jst.pagedesigner.viewer.IHTMLGraphicalViewer;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class PanelGridInsertRowCommand extends DesignerCommand
-{
- private int _rowIndex;
- private Element _panelGridEle;
-
- /**
- * consturctor
- * @param viewer
- * @param panelGrid
- * @param rowIndex
- */
- public PanelGridInsertRowCommand(IHTMLGraphicalViewer viewer, Element panelGrid, int rowIndex)
- {
- super(CommandResources.getString("PanelGridInsertRowCommand.Label.InsertRow"), viewer); //$NON-NLS-1$
- this._panelGridEle = panelGrid;
- this._rowIndex = rowIndex;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.gef.commands.Command#canExecute()
- */
- public boolean canExecute()
- {
- if (this._rowIndex < 0)
- {
- return false;
- }
- boolean hasHeaderRow = (JSFDOMUtil.findFacet(_panelGridEle, "header") != null); //$NON-NLS-1$
- //forbid insert row before header
- if (hasHeaderRow && _rowIndex == 0)
- {
- return false;
- }
-
- int offIndex = this._rowIndex;
- if (hasHeaderRow)
- {
- offIndex--;
- }
-
- int columns = DOMUtil.getIntAttributeIgnoreCase(_panelGridEle, IJSFConstants.ATTR_COLUMNS, 1);
- if (columns < 1)
- {
- columns = 1;
- }
- List children = JSFDOMUtil.getUIComponentChildren(_panelGridEle);
- int numRows = (children.size() + columns - 1) / columns;
- // //if the last element row is not full,then forbid insert row after the row
- // if ((children.size() % columns != 0) && (offIndex == numRows))
- // {
- // return false;
- // }
- //forbid insert row after the footer row
- if (offIndex > numRows)
- {
- return false;
- }
-
- return super.canExecute();
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#doExecute()
- */
- protected void doExecute()
- {
- boolean hasHeaderRow = (JSFDOMUtil.findFacet(_panelGridEle, "header") != null); //$NON-NLS-1$
-
- int columns = DOMUtil.getIntAttributeIgnoreCase(_panelGridEle, IJSFConstants.ATTR_COLUMNS, 1);
- if (columns < 1)
- {
- columns = 1;
- }
-
- List children = JSFDOMUtil.getUIComponentChildren(_panelGridEle);
- int numRows = (children.size() + columns - 1) / columns;
-
- int insertRow = _rowIndex;
-
- if (hasHeaderRow)
- {
- if (insertRow == 0)
- {
- return;
- }
- insertRow--;
- }
- //if (insertRow < numRows || ((insertRow == numRows) && (children.size() % columns == 0)))
-
- {
- int insertPoint = insertRow * columns;
- Node node = null;
- if (insertPoint < children.size())
- {
- node = (Node) children.get(insertPoint);
- }
-
- int adds = 0;
- //if insert after the last ui row
- if (insertRow >= numRows)
- {
- adds = columns * (numRows + 1) - children.size();
- }
- else
- {
- adds = columns;
- }
-
- for (int i = 0; i < adds; i++)
- {
- Node child = createDefaultNode();
- _panelGridEle.insertBefore(child, node);
- }
- formatNode(_panelGridEle);
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#getAfterCommandDesignerSelection()
- */
- protected ISelection getAfterCommandDesignerSelection()
- {
- return toDesignSelection(this._panelGridEle);
- }
-
- private Node createDefaultNode()
- {
- String prefix = JSPUtil.getOrCreatePrefix(getModel(), ITLDConstants.URI_JSF_HTML, "h"); //$NON-NLS-1$
- Element child = _panelGridEle.getOwnerDocument().createElement(IJSFConstants.TAG_OUTPUTTEXT);
- child.setPrefix(prefix);
- return child;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfcore/JSFCoreConverterFactory.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfcore/JSFCoreConverterFactory.java
deleted file mode 100644
index d3276ae..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfcore/JSFCoreConverterFactory.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfcore;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.IStructuredDocumentContextResolverFactory;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.IWorkspaceContextResolver;
-import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext;
-import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContextFactory2;
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.converter.AbstractTagConverter;
-import org.eclipse.jst.pagedesigner.converter.HiddenTagConverter;
-import org.eclipse.jst.pagedesigner.converter.IConverterFactory;
-import org.eclipse.jst.pagedesigner.converter.ITagConverter;
-import org.eclipse.jst.pagedesigner.converter.TagConverterToInlineBlock;
-import org.eclipse.jst.pagedesigner.dtmanager.converter.internal.DTTagConverter;
-import org.eclipse.jst.pagedesigner.editors.palette.TagImageManager;
-import org.eclipse.swt.graphics.Image;
-import org.w3c.dom.Element;
-
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class JSFCoreConverterFactory implements IConverterFactory
-{
-
- private final ILabelProvider _labelProvider;
-
- // TODO C.B: this is a transitional step so that we can incrementally add
- // new meta-data driven tag converter one-by-one without breaking other existing
- // if a tag name is in this set, the new DTTagConverter will be created for it,
- // else, revert to original one
- private final static Set _dtConversionSupported;
-
- static
- {
- _dtConversionSupported = new HashSet();
- /*
- _dtConversionSupported.add(IJSFConstants.TAG_VIEW);
- _dtConversionSupported.add(IJSFConstants.TAG_FACET);
- _dtConversionSupported.add(IJSFConstants.TAG_VERBATIM);
- */
- }
-
- /**
- *
- */
- public JSFCoreConverterFactory()
- {
- super();
- _labelProvider = new MyLabelProvider();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.IConverterFactory#createConverter(org.w3c.dom.Element)
- */
- public ITagConverter createConverter(Element element, int mode)
- {
- String tagName = element.getLocalName();
- ITagConverter converter;
-
- if (_dtConversionSupported.contains(tagName))
- {
- converter = createDTTagConverter(element);
- }
- else if (IJSFConstants.TAG_VIEW.equalsIgnoreCase(tagName) || IJSFConstants.TAG_SUBVIEW.equalsIgnoreCase(tagName))
- {
- converter = new ViewTagConverter(element);
- ((ViewTagConverter) converter).setNeedBorderDecorator(true);
- }
- else if (IJSFConstants.TAG_FACET.equalsIgnoreCase(tagName)
- || IJSFConstants.TAG_VERBATIM.equalsIgnoreCase(tagName))
- {
- AbstractTagConverter toSpan = new TagConverterToInlineBlock(element, mode);
- toSpan.setMinWidth(10);
- toSpan.setMinHeight(10);
- toSpan.setNeedBorderDecorator(true);
- converter = toSpan;
- }
- else if (IJSFConstants.TAG_LOADBUNDLE.equalsIgnoreCase(tagName))
- {
- converter = new LoadBundleTagConverter(element, _labelProvider);
- }
- else
- {
- converter = new HiddenTagConverter(element, _labelProvider);
- }
- converter.setMode(mode);
- return converter;
- }
-
- private static class MyLabelProvider extends org.eclipse.jface.viewers.LabelProvider
- {
-
- public Image getImage(Object element)
- {
- if (element instanceof ITagConverter)
- {
- final Element hostElement = ((ITagConverter)element).getHostElement();
- IStructuredDocumentContext context = IStructuredDocumentContextFactory2.INSTANCE.getContext(hostElement);
- if (context != null){
- IWorkspaceContextResolver wsResolver = IStructuredDocumentContextResolverFactory.INSTANCE.getWorkspaceContextResolver(context);
- if (wsResolver != null){
- return TagImageManager.getInstance().getSmallIconImage(wsResolver.getProject(),ITLDConstants.URI_JSF_CORE, hostElement.getLocalName());
- }
- }
- }
-
- return null;
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.IConverterFactory#getSupportedURI()
- */
- public String getSupportedURI()
- {
- return ITLDConstants.URI_JSF_CORE;
- }
-
- private ITagConverter createDTTagConverter(Element element)
- {
- return new DTTagConverter(element);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfcore/LoadBundleTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfcore/LoadBundleTagConverter.java
deleted file mode 100644
index 7cb56ba..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfcore/LoadBundleTagConverter.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfcore;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.util.HashMap;
-import java.util.PropertyResourceBundle;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jst.jsf.common.ui.IFileFolderConstants;
-import org.eclipse.jst.jsf.common.ui.internal.logging.Logger;
-import org.eclipse.jst.jsf.common.ui.internal.utils.ResourceUtils;
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.PDPlugin;
-import org.eclipse.jst.pagedesigner.converter.HiddenTagConverter;
-import org.eclipse.jst.pagedesigner.utils.PreviewUtil;
-import org.eclipse.jst.pagedesigner.utils.StructuredModelUtil;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Element;
-
-/**
- * @author mengbo
- */
-public class LoadBundleTagConverter extends HiddenTagConverter
-{
- private static Logger _log = PDPlugin.getLogger(LoadBundleTagConverter.class);
-
- /**
- * @param host
- * @param labelProvider
- */
- public LoadBundleTagConverter(Element host, ILabelProvider labelProvider)
- {
- super(host, labelProvider);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#convertRefresh(java.lang.Object)
- */
- public void convertRefresh(Object context)
- {
- Element hostEle = getHostElement();
- String varString = hostEle.getAttribute(IJSFConstants.ATTR_VAR);
- String baseName = hostEle.getAttribute(IJSFConstants.ATTR_BASENAME);
- if (baseName == null || varString == null)
- {
- return;
- }
- baseName = baseName.replace('.', '/') + IFileFolderConstants.DOT + IFileFolderConstants.EXT_PROPERTIES;
- IProject project = null;
-
- if (hostEle instanceof IDOMNode)
- {
- IDOMModel model = ((IDOMNode) hostEle).getModel();
- if (model != null)
- {
- project = StructuredModelUtil.getProjectFor(model);
- }
- }
- if (project == null)
- {
- return;
- }
- String prop = (new StringBuffer("webroot")
- .append(IFileFolderConstants.PATH_SEPARATOR).append(IFileFolderConstants.FOLDER_WEBINF).append(
- IFileFolderConstants.PATH_SEPARATOR).append(IFileFolderConstants.FOLDER_CLASS).append(
- IFileFolderConstants.PATH_SEPARATOR).append(baseName)).toString();
- IResource res = project.findMember(prop);
- if (res == null)
- {
- prop = IFileFolderConstants.FOLDER_SOURCE + IFileFolderConstants.PATH_SEPARATOR + baseName;
- res = project.findMember(prop);
- if (res == null)
- {
- return;
- }
- }
- InputStream ins = null;
- try
- {
- File f = new File(res.getLocation().toString());
- ins = new FileInputStream(f);
- if (ins != null)
- {
- ins = new BufferedInputStream(ins);
- PropertyResourceBundle bundle = new PropertyResourceBundle(ins);
- if (bundle != null)
- {
- if (PreviewUtil.getBUNDLE_MAP() == null)
- {
- PreviewUtil.setBUNDLE_MAP(new HashMap());
- }
- else
- {
- PreviewUtil.getBUNDLE_MAP().clear();
- }
- PreviewUtil.getBUNDLE_MAP().put(varString, bundle);
- PreviewUtil.setBUNDLE(bundle);
- PreviewUtil.setVAR(varString);
- }
- }
- }
- catch (MalformedURLException e)
- {
- _log.error("LoadBundleTagConverter.convertRefresh.MalformedURLException", e);
- return;
- }
- catch (IOException e)
- {
- _log.error("LoadBundleTagConverter.convertRefresh.IOException", e);
- return;
- }
- finally
- {
- ResourceUtils.ensureClosed(ins);
- }
-
- return;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfcore/ViewTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfcore/ViewTagConverter.java
deleted file mode 100644
index b6b6c27..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfcore/ViewTagConverter.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfcore;
-
-import org.eclipse.jst.pagedesigner.IHTMLConstants;
-import org.eclipse.jst.pagedesigner.converter.AbstractTagConverter;
-import org.eclipse.jst.pagedesigner.converter.ConverterUtil;
-import org.w3c.dom.Element;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class ViewTagConverter extends AbstractTagConverter
-{
- /**
- * @param host
- */
- public ViewTagConverter(Element host)
- {
- super(host);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.AbstractTagConverter#doConvertRefresh()
- */
- protected Element doConvertRefresh()
- {
- Element result = createElement(IHTMLConstants.TAG_DIV);
- copyChildren(getHostElement(), result);
-// if(!isPreviewMode())
-// {
-// result.setAttribute(IHTMLConstants.ATTR_STYLE,"margin:10px;");
-// }
- if(!isPreviewMode() && ConverterUtil.isEmptyContainer(getHostElement()))
- {
- result.appendChild(ConverterUtil.createDescriptionElement(getDestDocument(),null));
- }
- return result;
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isMultiLevel()
- */
- public boolean isMultiLevel()
- {
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.css2.style.ITagEditInfo#isWidget()
- */
- public boolean isWidget()
- {
- return false;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/ColumnTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/ColumnTagConverter.java
deleted file mode 100644
index b86d978..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/ColumnTagConverter.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfhtml;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.IHTMLConstants;
-import org.eclipse.jst.pagedesigner.converter.AbstractTagConverter;
-import org.eclipse.jst.pagedesigner.converter.ConvertPosition;
-import org.eclipse.jst.pagedesigner.css2.property.ICSSPropertyID;
-import org.eclipse.jst.pagedesigner.dom.EditModelQuery;
-import org.eclipse.jst.pagedesigner.jsf.core.dom.JSFDOMUtil;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class ColumnTagConverter extends AbstractTagConverter
-{
-
- /**
- * @param host
- */
- public ColumnTagConverter(Element host)
- {
- super(host);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.converter.AbstractTagConverter#doConvertRefresh()
- */
- protected Element doConvertRefresh()
- {
- Element hostEle = getHostElement();
- // we render all non-facet (header, footer) sub elements of this element
- Element resultEle = createElement(IHTMLConstants.TAG_TD);
- // --- create column's td in column tag converter, this should not be final solution, we might need to use
- // referece column figure in td later.
-
- Node parent = hostEle.getParentNode();
- int offset;
- if (parent != null && parent.getLocalName().equals(IJSFConstants.TAG_DATATABLE))
- {
- String columnClassesAttr = ((Element) parent).getAttribute(IJSFConstants.ATTR_COLUMNCLASSES);
- List columnClasses = new ArrayList();
- if (columnClassesAttr != null)
- {
- StringTokenizer tokenizer = new StringTokenizer(columnClassesAttr, ", ");
- while (tokenizer.hasMoreTokens())
- {
- columnClasses.add(tokenizer.nextToken());
- }
- }
- offset = EditModelQuery.getInstance().getSameTypeNodeIndex(hostEle);
- if (offset < columnClasses.size())
- {
- resultEle.setAttribute(ICSSPropertyID.ATTR_CLASS, (String) columnClasses.get(offset));
- }
- }
- if (EditModelQuery.getInstance().hasNonTransparentChild(hostEle, new String[]
- {
- IJSFConstants.TAG_FACET
- }
- ))
- {
- Node child = hostEle.getFirstChild();
- int index = 0;
- while (child != null)
- {
- if (!(child instanceof Element)
- || !JSFDOMUtil.isFacet((Element) child))
- {
- addChild(child, new ConvertPosition(resultEle, index++));
- }
- child = child.getNextSibling();
- }
- }
- else
- {
- Node child = createText(" ");
- resultEle.appendChild(child);
- }
- return resultEle;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isMultiLevel()
- */
- public boolean isMultiLevel()
- {
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isWidget()
- */
- public boolean isWidget()
- {
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.css2.style.ITagEditInfo#needBorderDecorator()
- */
- public boolean needBorderDecorator()
- {
- Element hostEle = getHostElement();
- Node parent = hostEle.getParentNode();
- if (parent != null && parent.getLocalName().equals(IJSFConstants.TAG_DATATABLE))
- {
- return false;
- }
- return true;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/CommandButtonTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/CommandButtonTagConverter.java
deleted file mode 100644
index e441ba3..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/CommandButtonTagConverter.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfhtml;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.IHTMLConstants;
-import org.eclipse.jst.pagedesigner.converter.AbstractTagConverter;
-import org.eclipse.jst.pagedesigner.converter.JSFConverterUtil;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class CommandButtonTagConverter extends AbstractTagConverter
-{
- private List _nonVisualChildren = Collections.EMPTY_LIST;
-
- /**
- * @param host
- */
- public CommandButtonTagConverter(Element host)
- {
- super(host);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.AbstractTagConverter#doConvertRefresh()
- */
- protected Element doConvertRefresh()
- {
- Element hostEle = getHostElement();
-
- // Renders an HTML "input" element.
- Element inputEle = createElement(IHTMLConstants.TAG_INPUT);
-
- // pass throught attributes
- JSFConverterUtil.copyAllAttributes(hostEle, inputEle, null);
-
-// If the "styleClass" attribute is specified, render its
- // value as the value of the "class" attribute.
- JSFConverterUtil.copyAttribute(hostEle, IJSFConstants.ATTR_STYLECLASS, inputEle, IHTMLConstants.ATTR_CLASS);
-
- inputEle.removeAttribute(IJSFConstants.ATTR_STYLECLASS);
-
- // next handles input type
- // "image" attribute: Absolute or relative URL of the image to be
- // displayed for this button. If specified, this "input" element will be
- // of type "image". Otherwise, it will be of the type specified by the
- // "type" property with a label specified by the "value" property.
-
- String imageAttr = hostEle.getAttribute(IJSFConstants.ATTR_IMAGE);
- String type;
- if (imageAttr == null || imageAttr.length() == 0)
- {
- type = hostEle.getAttribute(IJSFConstants.ATTR_TYPE);
- if (type == null || type.length() == 0)
- {
- type = "submit"; // default type
- }
- }
- else
- {
- type = "image";
- // copy the image attribute as the src attribute
- String src = mapURL(imageAttr);
- inputEle.setAttribute(IHTMLConstants.ATTR_SRC, src);
- }
- // overwrite the "type" attribute
- inputEle.setAttribute(IHTMLConstants.ATTR_TYPE, type);
-
- String value = hostEle.getAttribute(IJSFConstants.ATTR_VALUE);
- if (value != null && value.length() > 0)
- {
- value = mapValue(value);
- inputEle.setAttribute(IHTMLConstants.ATTR_VALUE, value);
- }
-
- // get non-visual children
- // a button only has non-visual children, so
- // all Element child nodes are considered such
- if (hostEle.hasChildNodes())
- {
- _nonVisualChildren = new ArrayList();
-
- NodeList list = hostEle.getChildNodes();
-
- for (int i = 0; i < list.getLength(); i++)
- {
- Node node = list.item(i);
-
- if (node.getNodeType() == Node.ELEMENT_NODE)
- {
- _nonVisualChildren.add(node);
- }
- }
- }
-
- // Render the clientId of the component as the value of the "name" attribute.
- // Render the current value of the component as the value of the "value" attribute.
-
- return inputEle;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isMultiLevel()
- */
- public boolean isMultiLevel()
- {
- return true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isWidget()
- */
- public boolean isWidget()
- {
- return true;
- }
-
- public List getNonVisualChildren() {
- return _nonVisualChildren;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/CommandLinkTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/CommandLinkTagConverter.java
deleted file mode 100644
index dcf09dc..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/CommandLinkTagConverter.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfhtml;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.IHTMLConstants;
-import org.eclipse.jst.pagedesigner.converter.AbstractTagConverter;
-import org.eclipse.jst.pagedesigner.converter.ConvertPosition;
-import org.eclipse.jst.pagedesigner.converter.ConverterUtil;
-import org.eclipse.jst.pagedesigner.converter.JSFConverterUtil;
-import org.eclipse.jst.pagedesigner.jsf.core.dom.JSFDOMUtil;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class CommandLinkTagConverter extends AbstractTagConverter
-{
-
- /**
- * @param host
- */
- public CommandLinkTagConverter(Element host)
- {
- super(host);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.converter.AbstractTagConverter#doConvertRefresh()
- */
- protected Element doConvertRefresh()
- {
- Element hostEle = getHostElement();
- // Render an HTML "a" anchor element that acts like a form submit button when clicked.
- Element aEle = createElement(IHTMLConstants.TAG_A);
-
- JSFConverterUtil.copyAllAttributes(hostEle, aEle, null);
-
- // If the "styleClass" attribute is specified, render its value as the value of the "class" attribute.
- JSFConverterUtil.copyAttribute(hostEle, IJSFConstants.ATTR_STYLECLASS, aEle, IHTMLConstants.ATTR_CLASS);
-
- aEle.removeAttribute(IJSFConstants.ATTR_STYLECLASS);
-
- // Render "#" as the value of the "href" attribute.
- aEle.setAttribute(IHTMLConstants.ATTR_HREF, "#");
- // Extend the container border a little to make it selectable
- if (!isPreviewMode())
- {
- String style = aEle.getAttribute(IHTMLConstants.ATTR_STYLE);
- style = "padding:0.3em;" + style;
- aEle.setAttribute(IHTMLConstants.ATTR_STYLE, style);
- }
-
- int childNodeIndex = 0;
- // Render the current value of the component as the link text if it
- // is specified.
- String value = hostEle.getAttribute(IJSFConstants.ATTR_VALUE);
- if (value != null && value.length() > 0)
- {
- value = mapValue(value);
- aEle.appendChild(createText(value));
- childNodeIndex = 1;
- }
- // generate children
- // Render any non-UIParameter children as normal inside of the "a" element.
- // These will appear as the link text.
-
- if (hostEle.hasChildNodes())
- {
- Node child = hostEle.getFirstChild();
- for (; child != null; child = child.getNextSibling())
- {
- if (!shouldIgnore(child))
- {
- if (child instanceof Element
- && (JSFDOMUtil.isUIParameter((Element) child) || isActionListener((Element) child)))
- {
- // skip
- }
- else
- {
- addChild(child, new ConvertPosition(aEle, childNodeIndex++));
- }
- }
- }
- }
- if (ConverterUtil.isEmptyContainer(hostEle) && !hostEle.hasAttribute(IJSFConstants.ATTR_VALUE))
- {
- aEle.appendChild(getDestDocument().createTextNode(IJSFConstants.TAG_COMMANDLINK));
- }
-
- return aEle;
- }
-
- private boolean isActionListener(Element element)
- {
- if(element != null && IJSFConstants.TAG_ACTIONLISTENER.equalsIgnoreCase(element.getLocalName()))
- {
- return true;
- }
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isMultiLevel()
- */
- public boolean isMultiLevel()
- {
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isWidget()
- */
- public boolean isWidget()
- {
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.css2.style.ITagEditInfo#needBorderDecorator()
- */
- public boolean needBorderDecorator()
- {
- return true;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/DataTableTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/DataTableTagConverter.java
deleted file mode 100644
index d4cc641..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/DataTableTagConverter.java
+++ /dev/null
@@ -1,305 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfhtml;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import org.eclipse.jst.jsf.common.dom.TagIdentifier;
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.jsf.core.internal.tld.TagIdentifierFactory;
-import org.eclipse.jst.pagedesigner.IHTMLConstants;
-import org.eclipse.jst.pagedesigner.converter.AbstractTagConverter;
-import org.eclipse.jst.pagedesigner.converter.ConvertPosition;
-import org.eclipse.jst.pagedesigner.converter.ConverterUtil;
-import org.eclipse.jst.pagedesigner.converter.JSFConverterUtil;
-import org.eclipse.jst.pagedesigner.jsf.core.dom.JSFDOMUtil;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class DataTableTagConverter extends AbstractTagConverter
-{
- private static final String FACET_NAME_HEADER = "header";
-
- /**
- * @param host
- */
- public DataTableTagConverter(Element host)
- {
- super(host);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.converter.AbstractTagConverter#doConvertRefresh()
- */
- protected Element doConvertRefresh()
- {
- Element hostEle = getHostElement();
-
- // Renders an HTML "table" element compliant with the HTML 401 specification.
- Element tableEle = createElement(IHTMLConstants.TAG_TABLE);
-
- // Any pass-through attributes are also rendered on the "table" element.
- JSFConverterUtil.copyAllAttributes(hostEle, tableEle, null);
-
- // Please consult the javadoc for UIData to supplement this specification.
- // If the "styleClass" attribute is specified, render its value as the value
- // of the "class" attribute on the "table" element.
- ConverterUtil.copyAttribute(hostEle, IJSFConstants.ATTR_STYLECLASS, tableEle, IHTMLConstants.ATTR_CLASS);
- tableEle.removeAttribute(IJSFConstants.ATTR_STYLECLASS);
-
- List columns = findUIColumns(hostEle);
-
- // rendering the thead
- convertTHeader(hostEle, tableEle, columns, true);
-
- convertTBody(hostEle, tableEle, columns);
- // rendering the tfoot
- // Follow the same process as for the header, except replace "header" with
- // "footer", "th" with "td", "thead" with "tfoot", and "headerClass" with
- // "footerClass". Do not render any "scope" attribute for the footer.
- convertTHeader(hostEle, tableEle, columns, false);
-
- return tableEle;
- }
-
- /**
- * @param hostEle
- * @return
- */
- private List findUIColumns(Element hostEle)
- {
- List result = new ArrayList();
- Node child = hostEle.getFirstChild();
- if (child != null)
- {
-
- while (child != null)
- {
- if (child instanceof Element)
- {
- Element ele = (Element) child;
- TagIdentifier tagId = TagIdentifierFactory.createDocumentTagWrapper(ele);
- if (IJSFConstants.TAG_IDENTIFIER_COLUMN.isSameTagType(tagId))
- {
- result.add(ele);
- }
- }
- child = child.getNextSibling();
- }
- }
- return result;
- }
-
- /**
- * @param hostEle
- * @param tableEle
- * @param columns
- */
- protected void convertTBody(Element hostEle, Element tableEle, List columns)
- {
- // Rendering the table body
- Element tbodyEle = createElement(IHTMLConstants.TAG_TBODY);
- tableEle.appendChild(tbodyEle);
- // Render a "tbody" element. Keep track of the result of the "rows" property
- // on the UIData component. Keep track of the number of rows we have rendered
- // so far.
- // Iterate through the rows. Set the "rowIndex" property of the UIDatacomponent
- // to be correct as we iterate through the rows.
- // Stop rendering children and close out the "tbody" element if the "rowAvailable"
- // property of the UIData returned false.
-
- // XXX: we are only rendering one row.
- // Output a "tr" element.
- Element trEle = createElement(IHTMLConstants.TAG_TR);
- tbodyEle.appendChild(trEle);
-
- // Output the value of the "rowClasses" per the attribute description below.
- String rowClasses = tableEle.getAttribute(IJSFConstants.ATTR_ROWCLASSES);
- if (rowClasses != null)
- {
- // as we are only rendering one row, so we only get the first rowclass
- StringTokenizer tokenizer = new StringTokenizer(rowClasses, ", ");
- if (tokenizer.hasMoreTokens())
- {
- trEle.setAttribute(IHTMLConstants.ATTR_CLASS, tokenizer.nextToken());
- }
- }
-
- // --------------------------------- move this part into ColumnsTagConverter. ------------------------------
- String columnClassesAttr = hostEle.getAttribute(IJSFConstants.ATTR_COLUMNCLASSES);
- List columnClasses = new ArrayList();
- if (columnClassesAttr != null)
- {
- StringTokenizer tokenizer = new StringTokenizer(columnClassesAttr, ", ");
- while (tokenizer.hasMoreTokens())
- {
- columnClasses.add(tokenizer.nextToken());
- }
- }
- // --- create column's td in column tag converter, here
- // For each UIColumn child, output a "td" element, attaching the value of the
- // "columnClasses" attribute of the UIData component per the attribute description below.
- // Recursively encode each child of each UIColumn child. Close out the "td" element.
- // When done with the row, close out the "tr" element. When done with all the rows,
- // close out the "tbody" element.
- for (int i = 0, size = columns.size(); i < size; i++)
- {
- Element column = (Element) columns.get(i);
- addChild(column, new ConvertPosition(trEle, i));
- // Element tdEle = createElement("td");
- // if (i < columnClasses.size())
- // {
- // tdEle.setAttribute("class", (String) columnClasses.get(i));
- // }
- //
- // trEle.appendChild(tdEle);
- // // put the "h:column" under td.
- // addChild(column, new ConvertPosition(tdEle, 0));
- }
- }
-
- /**
- * @param hostEle
- * @param tableEle
- * @param columns
- * @param header true means header, false means footer
- */
- protected void convertTHeader(Element hostEle, Element tableEle, List columns, boolean header)
- {
- // If the UIData component has a "header" facet, or any of the child UIColumn
- // components has a "header" facet, render a "thead" element.
- Element facetEle = JSFDOMUtil.findFacet(hostEle, header ? FACET_NAME_HEADER : "footer");
- boolean hasColHeader = false;
- for (int i = 0, size = columns.size(); i < size; i++)
- {
- Element uicolumnEle = (Element) columns.get(i);
- Element columnFacet = JSFDOMUtil.findFacet(uicolumnEle, header ? FACET_NAME_HEADER : "footer");
- if (columnFacet != null)
- {
- hasColHeader = true;
- break;
- }
- }
-
- if (facetEle == null && !hasColHeader)
- {
- return;
- }
- Element theadEle = createElement(header ? IHTMLConstants.TAG_THEAD : IHTMLConstants.TAG_TFOOT);
- tableEle.appendChild(theadEle);
-
- // If the UIData component has a "header" facet, encode its contents inside of
- // "tr" and "th" elements, respectively.
- if (facetEle != null)
- {
- Element trEle = createElement(IHTMLConstants.TAG_TR);
- theadEle.appendChild(trEle);
- Element thEle = createElement(header ? IHTMLConstants.TAG_TH : IHTMLConstants.TAG_TD);
- trEle.appendChild(thEle);
- // Output the value of the "headerClass" attribute of the UIData component,
- // if present, as the value of the "class" attribute on the "th".
- ConverterUtil.copyAttribute(hostEle, header ? IJSFConstants.ATTR_HEADERCLASS
- : IJSFConstants.ATTR_FOOTERCLASS, thEle, IHTMLConstants.ATTR_CLASS);
- // Output the number of child UIColumn components of theUIData component as
- // the value of the "colspan" attribute on the "th".
- if (columns.size() > 0)
- {
- thEle.setAttribute(IHTMLConstants.ATTR_COLSPAN, String.valueOf(columns.size()));
- }
-
- addChild(facetEle, new ConvertPosition(thEle, 0));
- }
- // Output "colgroup" as the value of the "scope" attribute on the "th" element.
-
- // If any of the child UIColumn components has a "header" facet render a "tr"
- // element.
- if (hasColHeader)
- {
- Element trEle = createElement(IHTMLConstants.TAG_TR);
- theadEle.appendChild(trEle);
-
- for (int i = 0, size = columns.size(); i < size; i++)
- {
- Element uicolumnEle = (Element) columns.get(i);
- Element columnFacet = JSFDOMUtil.findFacet(uicolumnEle, header ? FACET_NAME_HEADER : "footer");
- Element thEle = createElement(header ? IHTMLConstants.TAG_TH : IHTMLConstants.TAG_TD);
- trEle.appendChild(thEle);
- if (columnFacet != null)
- {
- // For eachUIColumn that actually has a "header" facet, render it inside of
- // a "th" element.
- addChild(columnFacet, new ConvertPosition(thEle, 0));
- }
- else
- {
- // Columns that don't have a "header" facet cause an empty "th" element to be
- // rendered.
- }
-
- // Output the value of the "headerClass" attribute of the UIData component,
- // if present, as the value of the "class" attribute on the "th".
- ConverterUtil.copyAttribute(hostEle, header ? IJSFConstants.ATTR_HEADERCLASS
- : IJSFConstants.ATTR_FOOTERCLASS, thEle, IHTMLConstants.ATTR_CLASS);
-
- // Output "col" as the value of the "colgroup" attribute on the "th" element.
- }
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isMultiLevel()
- */
- public boolean isMultiLevel()
- {
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isWidget()
- */
- public boolean isWidget()
- {
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.converter.AbstractTagConverter#needBorderDecorator()
- */
- public boolean needBorderDecorator()
- {
- return false;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.AbstractTagConverter#needTableDecorator()
- */
- public boolean needTableDecorator()
- {
- return true;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/GraphicImageTagConveter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/GraphicImageTagConveter.java
deleted file mode 100644
index 4705201..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/GraphicImageTagConveter.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfhtml;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.IHTMLConstants;
-import org.eclipse.jst.pagedesigner.converter.AbstractTagConverter;
-import org.eclipse.jst.pagedesigner.converter.ConverterUtil;
-import org.eclipse.jst.pagedesigner.converter.JSFConverterUtil;
-import org.w3c.dom.Element;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class GraphicImageTagConveter extends AbstractTagConverter
-{
-
- /**
- * @param host
- */
- public GraphicImageTagConveter(Element host)
- {
- super(host);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.AbstractTagConverter#doConvertRefresh()
- */
- protected Element doConvertRefresh()
- {
- Element hostEle = getHostElement();
- // Renders an HTML "img" element.
- Element imgEle = createElement(IHTMLConstants.TAG_IMG);
-
- JSFConverterUtil.copyAllAttributes(hostEle, imgEle, null);
-
- // If the "styleClass" attribute is specified, render its value as
- // the value of the "class" attribute.
- ConverterUtil.copyAttribute(hostEle, IJSFConstants.ATTR_STYLECLASS, imgEle, IHTMLConstants.ATTR_CLASS);
- imgEle.removeAttribute(IJSFConstants.ATTR_STYLECLASS);
-
- // Render the clientId as the value of the "id" attribute.
- // Render the value of the component as the value of the "src"
- // attribute, after passing it to the getResourceUR() method
- // of the ViewHandler for this application, and passing the
- // result through the encodeResourceURL() method of the
- // ExternalContext.
- String src = getSrc(hostEle);
- if (src != null)
- {
- imgEle.setAttribute(IHTMLConstants.ATTR_SRC, src);
- }
- return imgEle;
- }
-
- /**
- * @param hostEle
- * @return
- */
- private String getSrc(Element hostEle)
- {
- // TODO: need revisit the spec for special URL converting
- // for this element
- String value = hostEle.getAttribute(IJSFConstants.ATTR_VALUE);
- if (value == null)
- {
- // Context-relative URL to retrieve the resource associated
- // with this component. This is an alias for the "value"
- // property.
- value = hostEle.getAttribute(IJSFConstants.ATTR_URL);
- }
- if (value != null)
- {
- value = mapValue(value);
- value = mapURL(value);
- }
- return value;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isMultiLevel()
- */
- public boolean isMultiLevel()
- {
- return true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isWidget()
- */
- public boolean isWidget()
- {
- return true;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/InputTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/InputTagConverter.java
deleted file mode 100644
index 865e9aa..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/InputTagConverter.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfhtml;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.IHTMLConstants;
-import org.eclipse.jst.pagedesigner.converter.AbstractTagConverter;
-import org.eclipse.jst.pagedesigner.converter.JSFConverterUtil;
-import org.w3c.dom.Element;
-
-/**
- * This is for inputHidden, inputSecret, inputText.
- *
- * @author mengbo
- * @version 1.5
- */
-public class InputTagConverter extends AbstractTagConverter
-{
-
- private String _inputType;
-
- /**
- * @param host
- * @param inputType
- */
- public InputTagConverter(Element host, String inputType)
- {
- super(host);
- _inputType = inputType;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.AbstractTagConverter#doConvertRefresh()
- */
- protected Element doConvertRefresh()
- {
- Element hostEle = getHostElement();
- // Renders an HTML "input" element of "type" "text".
- Element inputEle = createElement(IHTMLConstants.TAG_INPUT);
- JSFConverterUtil.copyAllAttributes(hostEle, inputEle, null);
- JSFConverterUtil.copyAttribute(hostEle, IJSFConstants.ATTR_STYLECLASS, inputEle, IHTMLConstants.ATTR_CLASS);
- inputEle.removeAttribute(IJSFConstants.ATTR_STYLECLASS);
-
- inputEle.setAttribute(IHTMLConstants.ATTR_TYPE, getInputType());
-
- inputEle.removeAttribute(IJSFConstants.ATTR_VALUE);
- inputEle.setAttribute(IJSFConstants.ATTR_VALUE, getValue(hostEle));
-
- return inputEle;
- }
-
- /**
- * @param hostEle
- * @return
- */
- private String getValue(Element hostEle)
- {
- String valueAttr = hostEle.getAttribute(IJSFConstants.ATTR_VALUE);
- if (valueAttr == null)
- {
- String name = hostEle.getLocalName();
- return name.substring(0, 1).toUpperCase() + name.substring(1);
- }
- return mapValue(valueAttr);
- }
-
- /**
- * @return
- */
- private String getInputType()
- {
- return _inputType;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isMultiLevel()
- */
- public boolean isMultiLevel()
- {
- return true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isWidget()
- */
- public boolean isWidget()
- {
- return true;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/InputTextAreaTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/InputTextAreaTagConverter.java
deleted file mode 100644
index 845c9d4..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/InputTextAreaTagConverter.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfhtml;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.IHTMLConstants;
-import org.eclipse.jst.pagedesigner.converter.AbstractTagConverter;
-import org.eclipse.jst.pagedesigner.converter.JSFConverterUtil;
-import org.w3c.dom.Element;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class InputTextAreaTagConverter extends AbstractTagConverter
-{
-
- /**
- * @param host
- */
- public InputTextAreaTagConverter(Element host)
- {
- super(host);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.AbstractTagConverter#doConvertRefresh()
- */
- protected Element doConvertRefresh()
- {
- Element hostEle = getHostElement();
- // Renders an HTML "textarea" element.
- Element textareaEle = createElement(IHTMLConstants.TAG_TEXTAREA);
-
- JSFConverterUtil.copyAllAttributes(hostEle, textareaEle, null);
- JSFConverterUtil.copyAttribute(hostEle, IJSFConstants.ATTR_STYLECLASS, textareaEle, IHTMLConstants.ATTR_CLASS);
- textareaEle.removeAttribute(IJSFConstants.ATTR_STYLECLASS);
-
- String value = hostEle.getAttribute(IJSFConstants.ATTR_VALUE);
- if (value != null && value.length() > 0)
- {
- value = mapValue(value);
- textareaEle.appendChild(createText(value));
- }
-
- return textareaEle;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isMultiLevel()
- */
- public boolean isMultiLevel()
- {
- return true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isWidget()
- */
- public boolean isWidget()
- {
- return true;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/JSFFormTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/JSFFormTagConverter.java
deleted file mode 100644
index da4a9ed..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/JSFFormTagConverter.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfhtml;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.IHTMLConstants;
-import org.eclipse.jst.pagedesigner.converter.AbstractTagConverter;
-import org.eclipse.jst.pagedesigner.converter.JSFConverterUtil;
-import org.w3c.dom.Element;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class JSFFormTagConverter extends AbstractTagConverter
-{
-
- /**
- * @param host
- */
- public JSFFormTagConverter(Element host)
- {
- super(host);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.AbstractTagConverter#doConvertRefresh()
- */
- protected Element doConvertRefresh()
- {
- // The value of the "method" attribute must be "post". The value of the
- // "action" attribute must be the result of passing the view identifier
- // of the current view to the getActionURL() method of the ViewHandler for
- // this application, then passing that String to the encodeActionURL()
- // method on the ExternalContext.
- // XXX: as our tag converter only serve designer and preview, so we only
- // deal with attributes relating to visual effect. Ignoring "method", "action",
- // etc.
- Element hostEle = getHostElement();
-
- Element formEle = createElement(IHTMLConstants.TAG_FORM);
-
- // If the "styleClass" attribute is specified, render its value as the
- // value of the "class" attribute.
- JSFConverterUtil.copyAttribute(hostEle, IJSFConstants.ATTR_STYLECLASS, formEle, IHTMLConstants.ATTR_CLASS);
- formEle.removeAttribute(IJSFConstants.ATTR_STYLECLASS);
-
- // pass through other attributes
- // XXX: handle ignored attributes here.
- JSFConverterUtil.copyAllAttributes(hostEle, formEle, null);
-
- // Render all the necessary hidden fields for all commandLink instances
- // in the page just before the close of the "form" element.
- // XXX: ignored for these hidden fields.
-
- // children of old <h:form> should still be children.
- this.copyChildren(hostEle, formEle);
-
- return formEle;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isMultiLevel()
- */
- public boolean isMultiLevel()
- {
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isWidget()
- */
- public boolean isWidget()
- {
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.AbstractTagConverter#needBorderDecorator()
- */
- public boolean needBorderDecorator()
- {
- return true;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/JSFHTMLConverterFactory.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/JSFHTMLConverterFactory.java
deleted file mode 100644
index 5bf099f..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/JSFHTMLConverterFactory.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfhtml;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.IStructuredDocumentContextResolverFactory;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.IWorkspaceContextResolver;
-import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext;
-import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContextFactory2;
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.converter.HiddenTagConverter;
-import org.eclipse.jst.pagedesigner.converter.IConverterFactory;
-import org.eclipse.jst.pagedesigner.converter.ITagConverter;
-import org.eclipse.jst.pagedesigner.dtmanager.converter.internal.DTTagConverter;
-import org.eclipse.jst.pagedesigner.editors.palette.TagImageManager;
-import org.eclipse.swt.graphics.Image;
-import org.w3c.dom.Element;
-
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class JSFHTMLConverterFactory implements IConverterFactory
-{
- private final MyLabelProvider _labelProvider;
-
- // TODO C.B: this is a transitional step so that we can incrementally add
- // new meta-data driven tag converter one-by-one without breaking other existing
- // if a tag name is in this set, the new DTTagConverter will be created for it,
- // else, revert to original one
- private final static Set _dtConversionSupported;
-
- static
- {
- _dtConversionSupported = new HashSet();
- /*
- _dtConversionSupported.add(IJSFConstants.TAG_FORM);
- _dtConversionSupported.add(IJSFConstants.TAG_INPUTTEXT);
- _dtConversionSupported.add(IJSFConstants.TAG_INPUTSECRET);
- _dtConversionSupported.add(IJSFConstants.TAG_INPUTTEXTAREA);
- _dtConversionSupported.add(IJSFConstants.TAG_OUTPUTTEXT);
- _dtConversionSupported.add(IJSFConstants.TAG_OUTPUTLABEL);
- _dtConversionSupported.add(IJSFConstants.TAG_GRAPHICIMAGE);
- _dtConversionSupported.add(IJSFConstants.TAG_PANELGRID);
- */
- }
-
- /**
- *
- */
- public JSFHTMLConverterFactory()
- {
- super();
- _labelProvider = new MyLabelProvider();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.IConverterFactory#createConverter(org.w3c.dom.Element)
- */
- public ITagConverter createConverter(Element element, int mode)
- {
- ITagConverter converter;
- String tagName = element.getLocalName();
-
- if (_dtConversionSupported.contains(tagName))
- {
- converter = createDTTagConverter(element);
- }
- else if (IJSFConstants.TAG_COLUMN.equalsIgnoreCase(tagName))
- {
- converter = new ColumnTagConverter(element);
- }
- else if (IJSFConstants.TAG_COMMANDBUTTON.equalsIgnoreCase(tagName))
- {
- converter = new CommandButtonTagConverter(element);
- }
- else if (IJSFConstants.TAG_COMMANDLINK.equalsIgnoreCase(tagName))
- {
- converter = new CommandLinkTagConverter(element);
- }
- else if (IJSFConstants.TAG_DATATABLE.equalsIgnoreCase(tagName))
- {
- converter = new DataTableTagConverter(element);
- }
- else if (IJSFConstants.TAG_FORM.equalsIgnoreCase(tagName))
- {
- converter = new JSFFormTagConverter(element);
- }
- else if (IJSFConstants.TAG_GRAPHICIMAGE.equalsIgnoreCase(tagName))
- {
- converter = new GraphicImageTagConveter(element);
- }
- else if (IJSFConstants.TAG_INPUTHIDDEN.equalsIgnoreCase(tagName))
- {
- return new HiddenTagConverter(element, _labelProvider);
- }
- else if (IJSFConstants.TAG_INPUTSECRET.equalsIgnoreCase(tagName))
- {
- converter = new InputTagConverter(element, "password");
- }
- else if (IJSFConstants.TAG_INPUTTEXT.equalsIgnoreCase(tagName))
- {
- converter = new InputTagConverter(element, "text");
- }
- else if (IJSFConstants.TAG_INPUTTEXTAREA.equalsIgnoreCase(tagName))
- {
- converter = new InputTextAreaTagConverter(element);
- }
- else if (IJSFConstants.TAG_MESSAGE.equalsIgnoreCase(tagName)
- || IJSFConstants.TAG_MESSAGES.equalsIgnoreCase(tagName))
- {
- converter = new HiddenTagConverter(element, _labelProvider);
- }
- else if (IJSFConstants.TAG_OUTPUTTEXT.equalsIgnoreCase(tagName)
- || IJSFConstants.TAG_OUTPUTFORMAT.equalsIgnoreCase(tagName))
- {
- converter = new OutputTextTagConverter(element);
- }
- else if (IJSFConstants.TAG_OUTPUTLABEL.equalsIgnoreCase(tagName))
- {
- converter = new OutputLabelTagConverter(element);
- }
- else if (IJSFConstants.TAG_OUTPUTLINK.equalsIgnoreCase(tagName))
- {
- converter = new OutputLinkTagConverter(element);
- }
- else if (IJSFConstants.TAG_PANELGRID.equalsIgnoreCase(tagName))
- {
- converter = new PanelGridTagConverter(element);
- }
- else if (IJSFConstants.TAG_PANELGROUP.equalsIgnoreCase(tagName))
- {
- converter = new PanelGroupTagConverter(element);
- }
- else if (IJSFConstants.TAG_SELECTBOOLEANCHECKBOX.equalsIgnoreCase(tagName))
- {
- converter = new SelectBooleanCheckboxTagConverter(element);
- }
- else if (IJSFConstants.TAG_SELECTMANYCHECKBOX.equalsIgnoreCase(tagName))
- {
- converter = new TableBasedSelectTagConverter(element, "checkbox");
- }
- else if (IJSFConstants.TAG_SELECTMANYLISTBOX.equalsIgnoreCase(tagName))
- {
- converter = new SelectManyListboxTagConverter(element);
- }
- else if (IJSFConstants.TAG_SELECTMANYMENU.equalsIgnoreCase(tagName))
- {
- converter = new SelectManyMenuTagConverter(element);
- }
- else if (IJSFConstants.TAG_SELECTONELISTBOX.equalsIgnoreCase(tagName))
- {
- converter = new SelectOneListboxTagConverter(element);
- }
- else if (IJSFConstants.TAG_SELECTONEMENU.equalsIgnoreCase(tagName))
- {
- converter = new SelectOneMenuTagConverter(element);
- }
- else if (IJSFConstants.TAG_SELECTONERADIO.equalsIgnoreCase(tagName))
- {
- converter = new TableBasedSelectTagConverter(element, "radio");
- }
- else
- {
- return null;
- }
- converter.setMode(mode);
- return converter;
- }
-
- private static class MyLabelProvider extends LabelProvider
- {
- public Image getImage(Object element)
- {
- if (element instanceof ITagConverter)
- {
- final Element hostElement = ((ITagConverter)element).getHostElement();
- IStructuredDocumentContext context = IStructuredDocumentContextFactory2.INSTANCE.getContext(hostElement);
- if (context != null){
- IWorkspaceContextResolver wsResolver = IStructuredDocumentContextResolverFactory.INSTANCE.getWorkspaceContextResolver(context);
- if (wsResolver != null){
- return TagImageManager.getInstance().getSmallIconImage(wsResolver.getProject(),ITLDConstants.URI_JSF_HTML, hostElement.getLocalName());
- }
- }
- }
-
- return null;
- }
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.IConverterFactory#getSupportedURI()
- */
- public String getSupportedURI()
- {
- return ITLDConstants.URI_JSF_HTML;
- }
-
- private ITagConverter createDTTagConverter(Element element)
- {
- return new DTTagConverter(element);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/MessageTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/MessageTagConverter.java
deleted file mode 100644
index 6c87783..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/MessageTagConverter.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfhtml;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.IHTMLConstants;
-import org.eclipse.jst.pagedesigner.converter.AbstractTagConverter;
-import org.eclipse.jst.pagedesigner.converter.JSFConverterUtil;
-import org.eclipse.jst.pagedesigner.jsf.ui.util.JSFUIPluginResourcesUtil;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class MessageTagConverter extends AbstractTagConverter
-{
- private static final String MESSAGE_CONTENT = JSFUIPluginResourcesUtil.getInstance().getString(
- "MessageTagConverter.defaultValue");
- private static final String MESSAGE_TOOLTIP = JSFUIPluginResourcesUtil.getInstance().getString(
- "MessageTagConverter.defaultTooltip");
-
- /**
- * @param host
- */
- public MessageTagConverter(Element host)
- {
- super(host);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.AbstractTagConverter#doConvertRefresh()
- */
- protected Element doConvertRefresh()
- {
- Element hostEle = getHostElement();
-
- // If the "styleClass" or "style" attributes are present,
- // render a "span" element.
- // XXX: to make things simpler, we always create a span
- Element spanEle = createElement(IHTMLConstants.TAG_SPAN);
-
- // If the "style" attribute is present, pass it thru.
- // XXX: we are passing all the attributes through, since other attribute
- // don't conflict with html attributes.
- JSFConverterUtil.copyAllAttributes(hostEle, spanEle, null);
-
- // If the "styleClass" attribute is present,
- // output the value of the "styleClass" attribute as the value of the "class" attribute on the "span" element
- JSFConverterUtil.copyAttribute(hostEle, IJSFConstants.ATTR_STYLECLASS, spanEle, IHTMLConstants.ATTR_CLASS);
- spanEle.removeAttribute(IJSFConstants.ATTR_STYLECLASS);
-
- String fatalStyle = hostEle.getAttribute(IJSFConstants.ATTR_FATALSTYLE);
- String errorStyle = hostEle.getAttribute(IJSFConstants.ATTR_ERRORSTYLE);
- String warnStyle = hostEle.getAttribute(IJSFConstants.ATTR_WARNSTYLE);
- String infoStyle = hostEle.getAttribute(IJSFConstants.ATTR_INFOSTYLE);
- String fatalClass = hostEle.getAttribute(IJSFConstants.ATTR_FATALCLASS);
- String errorClass = hostEle.getAttribute(IJSFConstants.ATTR_ERRORCLASS);
- String warnClass = hostEle.getAttribute(IJSFConstants.ATTR_WARNCLASS);
- String infoClass = hostEle.getAttribute(IJSFConstants.ATTR_INFOCLASS);
-
- if ((!"".equals(fatalStyle)) && (fatalStyle != null))
- {
- spanEle.setAttribute(IHTMLConstants.ATTR_STYLE, fatalStyle);
- }
- else if ((!"".equals(errorStyle)) && (errorStyle != null))
- {
- spanEle.setAttribute(IHTMLConstants.ATTR_STYLE, errorStyle);
- }
- else if ((!"".equals(warnStyle)) && (warnStyle != null))
- {
- spanEle.setAttribute(IHTMLConstants.ATTR_STYLE, warnStyle);
- }
- else if ((!"".equals(infoStyle)) && (infoStyle != null))
- {
- spanEle.setAttribute(IHTMLConstants.ATTR_STYLE, infoStyle);
- }
-
- if ((!"".equals(fatalClass)) && (fatalClass != null))
- {
- spanEle.setAttribute(IJSFConstants.ATTR_STYLECLASS, fatalClass);
- }
- else if ((!"".equals(errorClass)) && (errorClass != null))
- {
- spanEle.setAttribute(IJSFConstants.ATTR_STYLECLASS, errorClass);
- }
- else if ((!"".equals(warnClass)) && (warnClass != null))
- {
- spanEle.setAttribute(IJSFConstants.ATTR_STYLECLASS, warnClass);
- }
- else if ((!"".equals(infoClass)) && (infoClass != null))
- {
- spanEle.setAttribute(IJSFConstants.ATTR_STYLECLASS, infoClass);
- }
- spanEle.removeAttribute(IJSFConstants.ATTR_STYLECLASS);
-
- //If the "tooltip" attribute is present with the value of "true", and so does
- //the "showSummary",then output the "summary" as the value of the "title" attribute on the "span".
- String hasToolTip = hostEle.getAttribute(IJSFConstants.ATTR_TOOLTIP);
- String showSummary = hostEle.getAttribute(IJSFConstants.ATTR_SHOWSUMMARY);
- if ("true".equalsIgnoreCase(hasToolTip))
- {
- if ("true".equalsIgnoreCase(showSummary))
- {
- spanEle.setAttribute("title", MESSAGE_TOOLTIP);
- }
- }
- Text text = createText(MESSAGE_CONTENT);
- spanEle.appendChild(text);
-
- return spanEle;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isMultiLevel()
- */
- public boolean isMultiLevel()
- {
- return true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.css2.style.ITagEditInfo#isWidget()
- */
- public boolean isWidget()
- {
- return true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.css2.style.ITagEditInfo#needBorderDecorator()
- */
- public boolean needBorderDecorator()
- {
- return true;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/MessagesTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/MessagesTagConverter.java
deleted file mode 100644
index 5926405..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/MessagesTagConverter.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfhtml;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.IHTMLConstants;
-import org.eclipse.jst.pagedesigner.converter.AbstractTagConverter;
-import org.eclipse.jst.pagedesigner.converter.JSFConverterUtil;
-import org.eclipse.jst.pagedesigner.jsf.ui.util.JSFUIPluginResourcesUtil;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class MessagesTagConverter extends AbstractTagConverter
-{
- private static final String MESSAGE_CONTENT = JSFUIPluginResourcesUtil.getInstance().getString(
- "MessageTagConverter.defaultValue");
- private static final String MESSAGE_TOOLTIP = JSFUIPluginResourcesUtil.getInstance().getString(
- "MessageTagConverter.defaultTooltip");
-
- /**
- * @param host
- */
- public MessagesTagConverter(Element host)
- {
- super(host);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.AbstractTagConverter#doConvertRefresh()
- */
- protected Element doConvertRefresh()
- {
- Element hostEle = getHostElement();
- String layout = hostEle.getAttribute(IJSFConstants.ATTR_LAYOUT);
- if (IHTMLConstants.TAG_TABLE.equalsIgnoreCase(layout))
- {
- Element table = createElement(IHTMLConstants.TAG_TABLE);
- table.setAttribute(IHTMLConstants.ATTR_BORDER, "1");
- for (int i = 0; i < 2; i++)
- {
- Element tr = createElement(IHTMLConstants.TAG_TR);
- Element td = createElement(IHTMLConstants.TAG_TD);
- Element span = createSpan();
- td.appendChild(span);
- tr.appendChild(td);
- table.appendChild(tr);
- }
- return table;
- }
- Element ul = createElement(IHTMLConstants.TAG_UL);
- for (int i = 0; i < 2; i++)
- {
- Element li = createElement(IHTMLConstants.TAG_LI);
- Element span = createSpan();
- li.appendChild(span);
- ul.appendChild(li);
- }
- return ul;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isMultiLevel()
- */
- public boolean isMultiLevel()
- {
- return true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.css2.style.ITagEditInfo#isWidget()
- */
- public boolean isWidget()
- {
- return true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.css2.style.ITagEditInfo#needBorderDecorator()
- */
- public boolean needBorderDecorator()
- {
- return true;
- }
-
- private Element createSpan()
- {
- Element hostEle = getHostElement();
-
- // If the "styleClass" or "style" attributes are present,
- // render a "span" element.
- // XXX: to make things simpler, we always create a span
- Element spanEle = createElement(IHTMLConstants.TAG_SPAN);
-
- // If the "style" attribute is present, pass it thru.
- // XXX: we are passing all the attributes through, since other attribute
- // don't conflict with html attributes.
- JSFConverterUtil.copyAllAttributes(hostEle, spanEle, null);
-
- // If the "styleClass" attribute is present,
- // output the value of the "styleClass" attribute as the value of the "class" attribute on the "span" element
- JSFConverterUtil.copyAttribute(hostEle, IJSFConstants.ATTR_STYLECLASS, spanEle, IHTMLConstants.ATTR_CLASS);
- spanEle.removeAttribute(IJSFConstants.ATTR_STYLECLASS);
-
- String fatalStyle = hostEle.getAttribute(IJSFConstants.ATTR_FATALSTYLE);
- String errorStyle = hostEle.getAttribute(IJSFConstants.ATTR_ERRORSTYLE);
- String warnStyle = hostEle.getAttribute(IJSFConstants.ATTR_WARNSTYLE);
- String infoStyle = hostEle.getAttribute(IJSFConstants.ATTR_INFOSTYLE);
- String fatalClass = hostEle.getAttribute(IJSFConstants.ATTR_FATALCLASS);
- String errorClass = hostEle.getAttribute(IJSFConstants.ATTR_ERRORCLASS);
- String warnClass = hostEle.getAttribute(IJSFConstants.ATTR_WARNCLASS);
- String infoClass = hostEle.getAttribute(IJSFConstants.ATTR_INFOCLASS);
-
- if ((!"".equals(fatalStyle)) && (fatalStyle != null))
- {
- spanEle.setAttribute(IHTMLConstants.ATTR_STYLE, fatalStyle);
- }
- else if ((!"".equals(errorStyle)) && (errorStyle != null))
- {
- spanEle.setAttribute(IHTMLConstants.ATTR_STYLE, errorStyle);
- }
- else if ((!"".equals(warnStyle)) && (warnStyle != null))
- {
- spanEle.setAttribute(IHTMLConstants.ATTR_STYLE, warnStyle);
- }
- else if ((!"".equals(infoStyle)) && (infoStyle != null))
- {
- spanEle.setAttribute(IHTMLConstants.ATTR_STYLE, infoStyle);
- }
-
- if ((!"".equals(fatalClass)) && (fatalClass != null))
- {
- spanEle.setAttribute(IJSFConstants.ATTR_STYLECLASS, fatalClass);
- }
- else if ((!"".equals(errorClass)) && (errorClass != null))
- {
- spanEle.setAttribute(IJSFConstants.ATTR_STYLECLASS, errorClass);
- }
- else if ((!"".equals(warnClass)) && (warnClass != null))
- {
- spanEle.setAttribute(IJSFConstants.ATTR_STYLECLASS, warnClass);
- }
- else if ((!"".equals(infoClass)) && (infoClass != null))
- {
- spanEle.setAttribute(IJSFConstants.ATTR_STYLECLASS, infoClass);
- }
-
- //If the "tooltip" attribute is present with the value of "true", and so does
- //the "showSummary",then output the "summary" as the value of the "title" attribute on the "span".
- String hasToolTip = hostEle.getAttribute(IJSFConstants.ATTR_TOOLTIP);
- String showSummary = hostEle.getAttribute(IJSFConstants.ATTR_SHOWSUMMARY);
- if ("true".equalsIgnoreCase(hasToolTip))
- {
- if ("true".equalsIgnoreCase(showSummary))
- {
- spanEle.setAttribute(IHTMLConstants.ATTR_TITLE, MESSAGE_TOOLTIP);
- }
- }
- Text text = createText(MESSAGE_CONTENT);
- spanEle.appendChild(text);
-
- return spanEle;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/OutputLabelTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/OutputLabelTagConverter.java
deleted file mode 100644
index 73ea98e..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/OutputLabelTagConverter.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfhtml;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.IHTMLConstants;
-import org.eclipse.jst.pagedesigner.converter.AbstractTagConverter;
-import org.eclipse.jst.pagedesigner.converter.ConvertPosition;
-import org.eclipse.jst.pagedesigner.converter.JSFConverterUtil;
-import org.eclipse.jst.pagedesigner.jsf.core.dom.JSFDOMUtil;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class OutputLabelTagConverter extends AbstractTagConverter
-{
- /**
- * @param host
- */
- public OutputLabelTagConverter(Element host)
- {
- super(host);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.AbstractTagConverter#doConvertRefresh()
- */
- protected Element doConvertRefresh()
- {
- Element hostEle = getHostElement();
-
- Element labelEle = createElement(IHTMLConstants.TAG_LABEL);
-
- JSFConverterUtil.copyAllAttributes(hostEle, labelEle, null);
-
- // If the "styleClass" attribute is present,
- // render its value as the value of the "class" attribute.
- JSFConverterUtil.copyAttribute(hostEle, IJSFConstants.ATTR_STYLECLASS, labelEle, IHTMLConstants.ATTR_CLASS);
- labelEle.removeAttribute(IJSFConstants.ATTR_STYLECLASS);
-
- // String value = getValue(hostEle);
- // Text textNode = createText(value);
- // labelEle.appendChild(textNode);
-
- int index = 0;
- Node child = hostEle.getFirstChild();
- if (hostEle.hasChildNodes())
- {
- for (; child != null; child = child.getNextSibling())
- {
- if (!shouldIgnore(child))
- {
- if (child instanceof Element && JSFDOMUtil.isUIParameter((Element) child))
- {
- // skip
- }
- else
- {
- addChild(child, new ConvertPosition(labelEle, index++));
- }
- }
- }
- }
- else
- {
- labelEle.appendChild(createText(getDefaultValue()));
- }
-
- return labelEle;
- }
-
- /**
- * @param hostEle
- * @return
- */
- private String getDefaultValue()
- {
- String name = IJSFConstants.TAG_OUTPUTLABEL;
-
- return name.substring(0, 1).toUpperCase() + name.substring(1);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isMultiLevel()
- */
- public boolean isMultiLevel()
- {
- return true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isWidget()
- */
- public boolean isWidget()
- {
- return true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.css2.style.ITagEditInfo#needBorderDecorator()
- */
- public boolean needBorderDecorator()
- {
- return true;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/OutputLinkTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/OutputLinkTagConverter.java
deleted file mode 100644
index f90bdf9..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/OutputLinkTagConverter.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfhtml;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.IHTMLConstants;
-import org.eclipse.jst.pagedesigner.converter.AbstractTagConverter;
-import org.eclipse.jst.pagedesigner.converter.ConvertPosition;
-import org.eclipse.jst.pagedesigner.converter.ConverterUtil;
-import org.eclipse.jst.pagedesigner.converter.JSFConverterUtil;
-import org.eclipse.jst.pagedesigner.jsf.core.dom.JSFDOMUtil;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class OutputLinkTagConverter extends AbstractTagConverter
-{
-
- /**
- * @param host
- */
- public OutputLinkTagConverter(Element host)
- {
- super(host);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.converter.AbstractTagConverter#doConvertRefresh()
- */
- protected Element doConvertRefresh()
- {
- Element hostEle = getHostElement();
-
- Element aEle = createElement(IHTMLConstants.TAG_A);
-
- // If the "style" attribute is present, pass it thru.
- // XXX: we are passing all the attributes through, since other attribute
- // don't conflict with html attributes.
- JSFConverterUtil.copyAllAttributes(hostEle, aEle, null);
-
- // If the "styleClass" attribute is present,
- // render its value as the value of the "class" attribute.
- JSFConverterUtil.copyAttribute(hostEle, IJSFConstants.ATTR_STYLECLASS, aEle, IHTMLConstants.ATTR_CLASS);
- aEle.removeAttribute(IJSFConstants.ATTR_STYLECLASS);
-
- // value should be mapped to href, but it won't affect visual
- // so use "#"
- aEle.setAttribute(IHTMLConstants.ATTR_HREF, "#");
-
- JSFConverterUtil.copyAttribute(hostEle, IJSFConstants.ATTR_VALUE, aEle, IHTMLConstants.ATTR_HREF);
- aEle.removeAttribute(IJSFConstants.ATTR_VALUE);
-
- // Extend the container border a little to make it selectable
- if (!isPreviewMode())
- {
- String style = aEle.getAttribute(IHTMLConstants.ATTR_STYLE);
- style = "padding:0.3em;" + style;
- aEle.setAttribute(IHTMLConstants.ATTR_STYLE, style);
- }
-
- int index = 0;
- Node child = hostEle.getFirstChild();
- if (hostEle.hasChildNodes())
- {
- for (; child != null; child = child.getNextSibling())
- {
- if (!shouldIgnore(child))
- {
- if (child instanceof Element && JSFDOMUtil.isUIParameter((Element) child))
- {
- // skip
- }
- else
- {
- addChild(child, new ConvertPosition(aEle, index++));
- }
- }
- }
- }
- if (ConverterUtil.isEmptyContainer(hostEle) && !hostEle.hasAttribute(IJSFConstants.ATTR_VALUE))
- {
- aEle.appendChild(createText(getDefaultValue()));
- }
- return aEle;
- }
-
- private String getDefaultValue()
- {
- String name = IJSFConstants.TAG_OUTPUTLINK;
-
- return name.substring(0, 1).toUpperCase() + name.substring(1);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isMultiLevel()
- */
- public boolean isMultiLevel()
- {
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isWidget()
- */
- public boolean isWidget()
- {
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.css2.style.ITagEditInfo#needBorderDecorator()
- */
- public boolean needBorderDecorator()
- {
- return true;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/OutputTextTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/OutputTextTagConverter.java
deleted file mode 100644
index 0897a59..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/OutputTextTagConverter.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfhtml;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.IHTMLConstants;
-import org.eclipse.jst.pagedesigner.converter.AbstractTagConverter;
-import org.eclipse.jst.pagedesigner.converter.JSFConverterUtil;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class OutputTextTagConverter extends AbstractTagConverter
-{
-
- /**
- * @param host
- */
- public OutputTextTagConverter(Element host)
- {
- super(host);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.AbstractTagConverter#doConvertRefresh()
- */
- protected Element doConvertRefresh()
- {
- Element hostEle = getHostElement();
-
- // If the "styleClass" or "style" attributes are present,
- // render a "span" element.
- // XXX: to make things simpler, we always create a span
- Element spanEle = createElement(IHTMLConstants.TAG_SPAN);
-
- // If the "style" attribute is present, pass it thru.
- // XXX: we are passing all the attributes through, since other attribute
- // don't conflict with html attributes.
- JSFConverterUtil.copyAllAttributes(hostEle, spanEle, null);
-
- // If the "styleClass" attribute is present,
- // render its value as the value of the "class" attribute.
- JSFConverterUtil.copyAttribute(hostEle, IJSFConstants.ATTR_STYLECLASS, spanEle, IHTMLConstants.ATTR_CLASS);
- spanEle.removeAttribute(IJSFConstants.ATTR_STYLECLASS);
-
- spanEle.removeAttribute(IJSFConstants.ATTR_VALUE);
-
- // If the "escape" attribute is not present, or it is present and
- // its value is "true" all angle brackets should be converted to the
- // ampersand xx semicolon syntax when rendering the value of the "value"
- // attribute as the value of the component. If the "escape" attribute is
- // present and is "false" the value of the component should be rendered
- // as text without escaping.
- String value = getValue(hostEle);
- Text textNode = createText(value);
- spanEle.appendChild(textNode);
-
- return spanEle;
- }
-
- /**
- * @param hostEle
- * @return
- */
- private String getValue(Element hostEle)
- {
- String valueAttr = hostEle.getAttribute(IJSFConstants.ATTR_VALUE);
- if (valueAttr == null)
- {
- String name = hostEle.getLocalName();
- return name.substring(0, 1).toUpperCase() + name.substring(1);
- }
- return mapValue(valueAttr);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isMultiLevel()
- */
- public boolean isMultiLevel()
- {
- return true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isWidget()
- */
- public boolean isWidget()
- {
- return true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.AbstractTagConverter#needBorderDecorator()
- */
- public boolean needBorderDecorator()
- {
- return true;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/PanelGridTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/PanelGridTagConverter.java
deleted file mode 100644
index a163cee..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/PanelGridTagConverter.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfhtml;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.jsf.core.dom.JSFDOMUtil;
-import org.w3c.dom.Element;
-
-import org.eclipse.jst.pagedesigner.IHTMLConstants;
-import org.eclipse.jst.pagedesigner.converter.AbstractTagConverter;
-import org.eclipse.jst.pagedesigner.converter.ConvertPosition;
-import org.eclipse.jst.pagedesigner.converter.JSFConverterUtil;
-import org.eclipse.jst.pagedesigner.utils.DOMUtil;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class PanelGridTagConverter extends AbstractTagConverter
-{
- /**
- * @param host
- */
- public PanelGridTagConverter(Element host)
- {
- super(host);
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.visualtag.AbstractTagConverter#doConvertRefresh()
- */
- protected Element doConvertRefresh()
- {
- Element panelGridEle = this.getHostElement();
-
- // Renders an HTML "table" element, conforming to the rules in the HTML 401 specification.
- Element tableEle = createElement(IHTMLConstants.TAG_TABLE);
-
- // Render the pass-through attributes in the table below.
- // TODO: need handle ignored attributes here. But as they don't conflict
- // with standard table attributes, so its ok that we leave it later.
- JSFConverterUtil.copyAllAttributes(panelGridEle, tableEle, null);
-
- // If the "styleClass" attribute is specified, render its value as the value of the "class" attribute
- JSFConverterUtil.copyAttribute(panelGridEle, IJSFConstants.ATTR_STYLECLASS, tableEle, IHTMLConstants.ATTR_CLASS);
- tableEle.removeAttribute(IJSFConstants.ATTR_STYLECLASS);
-
- int columns = DOMUtil.getIntAttributeIgnoreCase(panelGridEle, IJSFConstants.ATTR_COLUMNS, 1);
- if (columns < 1)
- {
- columns = 1;
- }
-
- // Render the "header" facet, if present, inside of "thead", "tr", and "th" elements, nested in that order.
- Element facet = JSFDOMUtil.findFacet(panelGridEle, "header");
- if (facet != null)
- {
- // we need render a thead here
- Element theadEle = createElement(IHTMLConstants.TAG_THEAD);
- tableEle.appendChild(theadEle);
- Element trEle = createElement(IHTMLConstants.TAG_TR);
- theadEle.appendChild(trEle);
- Element thEle = createElement(IHTMLConstants.TAG_TH);
- trEle.appendChild(thEle);
- // If the "headerClass" attribute is specifed, render its value as the value of the "class" attribute on
- // the "th" element.
- String headerClass = panelGridEle.getAttribute(IJSFConstants.ATTR_HEADERCLASS);
- if (headerClass != null && headerClass.length() > 0)
- {
- thEle.setAttribute(IHTMLConstants.ATTR_CLASS, headerClass);
- }
- // Render the value of the "columns" attribute as the value of the "colspan" attribute on the "th" element.
- thEle.setAttribute(IHTMLConstants.ATTR_COLSPAN, String.valueOf(columns));
- addChild(facet, new ConvertPosition(thEle, 0));
- }
-
- // Render the "footer" facet if present, using similar logic to the rendering of
- // the "header", but replacing "thead" with "tfoot", "th" with "td", and "headerClass"
- // with "footerClass".
- facet = JSFDOMUtil.findFacet(panelGridEle, "footer");
- if (facet != null)
- {
- // we need render a thead here
- Element theadEle = createElement(IHTMLConstants.TAG_TFOOT);
- tableEle.appendChild(theadEle);
- Element trEle = createElement(IHTMLConstants.TAG_TR);
- theadEle.appendChild(trEle);
- Element tdEle = createElement(IHTMLConstants.TAG_TD);
- trEle.appendChild(tdEle);
- // If the "headerClass" attribute is specifed, render its value as the value of the "class" attribute on
- // the "th" element.
- String footerClass = panelGridEle.getAttribute(IJSFConstants.ATTR_FOOTERCLASS);
- if (footerClass != null && footerClass.length() > 0)
- {
- tdEle.setAttribute(IHTMLConstants.ATTR_CLASS, footerClass);
- }
- // Render the value of the "columns" attribute as the value of the "colspan" attribute on the "th" element.
- tdEle.setAttribute(IHTMLConstants.ATTR_COLSPAN, String.valueOf(columns));
- addChild(facet, new ConvertPosition(tdEle, 0));
- }
-
- List rowclasses = new ArrayList();
- String rowclassesattr = panelGridEle.getAttribute(IJSFConstants.ATTR_ROWCLASSES);
- if (rowclassesattr != null)
- {
- StringTokenizer tokenizer = new StringTokenizer(rowclassesattr, ", ");
- while (tokenizer.hasMoreTokens())
- {
- rowclasses.add(tokenizer.nextToken());
- }
- }
-
- List columnclasses = new ArrayList();
- String columnclassattr = panelGridEle.getAttribute(IJSFConstants.ATTR_COLUMNCLASSES);
- if (columnclassattr != null)
- {
- StringTokenizer tokenizer = new StringTokenizer(columnclassattr, ", ");
- while (tokenizer.hasMoreTokens())
- {
- columnclasses.add(tokenizer.nextToken());
- }
- }
-
- // Render the children of the UIPanel component inside of a "tbody" element.
- // Render the children based on the value of the "columns" attribute, creating a new
- // row each time a "columns" worth of children have been rendered. Each child is rendered
- // inside of a "td" element. If a child has "rendered==false" it is not rendered,
- // and the column counter must not be incremented.
- Element tbody = createElement(IHTMLConstants.TAG_TBODY);
- tableEle.appendChild(tbody);
-
- List uipanelChildren = JSFDOMUtil.getUIComponentChildren(panelGridEle);
- Element currentTr = null;
- int nextRow = 0; // for rowclasses
- for (int i = 0; i < uipanelChildren.size(); i++)
- {
- int columnIndex = i % columns;
- if (columnIndex == 0)
- {
- currentTr = createElement(IHTMLConstants.TAG_TR);
- if (!rowclasses.isEmpty())
- {
- currentTr.setAttribute(IHTMLConstants.ATTR_CLASS, (String) rowclasses.get(nextRow));
- nextRow = (nextRow + 1) % rowclasses.size();
- }
- tbody.appendChild(currentTr);
- }
- Element uichild = (Element) uipanelChildren.get(i);
- Element td = createElement(IHTMLConstants.TAG_TD);
- if (columnIndex < columnclasses.size())
- {
- td.setAttribute(IHTMLConstants.ATTR_CLASS, (String) columnclasses.get(columnIndex));
- }
- currentTr.appendChild(td);
- this.addChild(uichild, new ConvertPosition(td, 0));
- }
-
- return (tableEle);
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.visualtag.ITagConverter#isMultiLevel()
- */
- public boolean isMultiLevel()
- {
- return true;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.visualtag.ITagConverter#isWidget()
- */
- public boolean isWidget()
- {
- return false;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.css2.style.ITagEditInfo#needBorderDecorator()
- */
- public boolean needBorderDecorator()
- {
- return true;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.AbstractTagConverter#needTableDecorator()
- */
- public boolean needTableDecorator()
- {
- return true;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/PanelGroupTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/PanelGroupTagConverter.java
deleted file mode 100644
index d98d241..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/PanelGroupTagConverter.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfhtml;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.IHTMLConstants;
-import org.eclipse.jst.pagedesigner.converter.AbstractTagConverter;
-import org.eclipse.jst.pagedesigner.converter.JSFConverterUtil;
-import org.w3c.dom.Element;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class PanelGroupTagConverter extends AbstractTagConverter
-{
-
- /**
- * @param host
- */
- public PanelGroupTagConverter(Element host)
- {
- super(host);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.converter.AbstractTagConverter#doConvertRefresh()
- */
- protected Element doConvertRefresh()
- {
- Element hostEle = getHostElement();
-
- // If the "styleClass" or "style" attributes are present,
- // render a "span" element.
- // XXX: for page designer to have the panelGroup to always take up space,
- // we use "div".
- Element spanEle = createElement(IHTMLConstants.TAG_DIV);
-
- // If the "style" attribute is present, pass it thru.
- // XXX: we are passing all the attributes through, since other attribute
- // don't conflict with html attributes.
- JSFConverterUtil.copyAllAttributes(hostEle, spanEle, null);
-
- // If the "styleClass" attribute is present,
- // render its value as the value of the "class" attribute.
- JSFConverterUtil.copyAttribute(hostEle, IJSFConstants.ATTR_STYLECLASS, spanEle, IHTMLConstants.ATTR_CLASS);
- spanEle.removeAttribute(IJSFConstants.ATTR_STYLECLASS);
-
- copyChildren(hostEle, spanEle);
- return spanEle;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isMultiLevel()
- */
- public boolean isMultiLevel()
- {
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isWidget()
- */
- public boolean isWidget()
- {
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.css2.style.ITagEditInfo#needBorderDecorator()
- */
- public boolean needBorderDecorator()
- {
- return true;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectBasedTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectBasedTagConverter.java
deleted file mode 100644
index 151b8c6..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectBasedTagConverter.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfhtml;
-
-import java.util.List;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.IHTMLConstants;
-import org.eclipse.jst.pagedesigner.converter.ConverterUtil;
-import org.eclipse.jst.pagedesigner.converter.JSFConverterUtil;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public abstract class SelectBasedTagConverter extends SelectTagConverter
-{
-
- /**
- * @param host
- */
- public SelectBasedTagConverter(Element host)
- {
- super(host);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.AbstractTagConverter#doConvertRefresh()
- */
- protected Element doConvertRefresh()
- {
- Element hostEle = getHostElement();
-
- // Render an HTML "select" element.
- Element selectEle = createElement(IHTMLConstants.TAG_SELECT);
-
- // Render the clientId of the component as the value of the "name" attribute.
- ConverterUtil.copyAttribute(hostEle, IJSFConstants.ATTR_ID, selectEle, IHTMLConstants.ATTR_NAME);
-
- // XXX: handle ignore
- JSFConverterUtil.copyAllAttributes(hostEle, selectEle, null);
-
-// If the "styleClass" attribute is specified, render its value as the value of
- // the "class" attribute on the "select" element.
- JSFConverterUtil.copyAttribute(hostEle, IJSFConstants.ATTR_STYLECLASS, selectEle, IHTMLConstants.ATTR_CLASS);
- selectEle.removeAttribute(IJSFConstants.ATTR_STYLECLASS);
-
- // child class may generated different multiple and size attribute
- handleMultipleAndSize(hostEle, selectEle);
-
- // next generated the options under the <select>, so they can also be displayed.
- List selectItems = this.getSelectItems(hostEle);
- for (int i=0, size=selectItems.size(); i<size; i++)
- {
- SelectItemModel item = (SelectItemModel) selectItems.get(i);
- Element option = createElement(IHTMLConstants.TAG_OPTION);
- option.setAttribute(IHTMLConstants.ATTR_VALUE, item.getItemValue());
- Text textNode = createText(item.getDisplayString());
- option.appendChild(textNode);
- selectEle.appendChild(option);
- }
-
- return (selectEle);
- }
-
- /**
- * @param hostEle
- * @param selectEle
- */
- protected abstract void handleMultipleAndSize(Element hostEle, Element selectEle);
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectBooleanCheckboxTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectBooleanCheckboxTagConverter.java
deleted file mode 100644
index b0b2720..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectBooleanCheckboxTagConverter.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfhtml;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.IHTMLConstants;
-import org.eclipse.jst.pagedesigner.converter.AbstractTagConverter;
-import org.eclipse.jst.pagedesigner.converter.JSFConverterUtil;
-import org.w3c.dom.Element;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class SelectBooleanCheckboxTagConverter extends AbstractTagConverter
-{
-
- /**
- * @param host
- */
- public SelectBooleanCheckboxTagConverter(Element host)
- {
- super(host);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.AbstractTagConverter#doConvertRefresh()
- */
- protected Element doConvertRefresh()
- {
- Element hostEle = getHostElement();
- // Renders an HTML "input" element of type "checkbox".
- Element inputEle = createElement(IHTMLConstants.TAG_INPUT);
- JSFConverterUtil.copyAllAttributes(hostEle, inputEle, null);
- JSFConverterUtil.copyAttribute(hostEle, IJSFConstants.ATTR_STYLECLASS, inputEle, IHTMLConstants.ATTR_CLASS);
- inputEle.removeAttribute(IJSFConstants.ATTR_STYLECLASS);
-
- inputEle.setAttribute(IHTMLConstants.ATTR_TYPE, "checkbox");
-
- if ("true".equalsIgnoreCase(inputEle.getAttribute(IHTMLConstants.ATTR_VALUE)))
- {
- inputEle.setAttribute(IHTMLConstants.ATTR_CHECKED,"checked");
- }
- return inputEle;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isMultiLevel()
- */
- public boolean isMultiLevel()
- {
- return true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isWidget()
- */
- public boolean isWidget()
- {
- return true;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectItemModel.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectItemModel.java
deleted file mode 100644
index 089c92f..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectItemModel.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfhtml;
-
-/**
- * This class emulate a javax.faces.model.SelectItem
- *
- * @author mengbo
- * @version 1.5
- */
-public class SelectItemModel
-{
- private String _description;
- private String _label;
- private String _itemValue;
- private String _value;
- private String _id;
- private boolean _disabled;
-
- /**
- * @return Returns the disabled.
- */
- public boolean isDisabled()
- {
- return _disabled;
- }
-
- /**
- * @param disabled The disabled to set.
- */
- public void setDisabled(boolean disabled)
- {
- this._disabled = disabled;
- }
-
- /**
- * Return a description of this item, for use in development tools.
- * @return the description
- */
- public String getDescription()
- {
- return _description;
- }
-
- /**
- * Return the label of this item, to be rendered visibly for the user.
- * @return the label for this item
- */
- public String getLabel()
- {
- return _label;
- }
-
- /**
- * Set the description of this item, for use in development tools.
- * @param description
- */
- public void setDescription(java.lang.String description)
- {
- _description = description;
- }
-
- /**
- * Set the label of this item, to be rendered visibly for the user.
- * @param label
- */
- public void setLabel(java.lang.String label)
- {
- this._label = label;
- }
- /**
- * @return the item value
- */
- public String getItemValue()
- {
- return _itemValue;
- }
-
- /**
- * @param itemValue
- */
- public void setItemValue(String itemValue)
- {
- this._itemValue = itemValue;
- }
-
- /**
- * @return the value
- */
- public String getValue()
- {
- return _value;
- }
-
- /**
- * @param value
- */
- public void setValue(String value)
- {
- this._value = value;
- }
-
- /**
- * @return the id
- */
- public String getId()
- {
- return _id;
- }
-
- /**
- * @param id
- */
- public void setId(String id)
- {
- _id = id;
- }
-
- /**
- * @return the display string
- */
- public String getDisplayString()
- {
- if (_label != null && _label.length() > 0)
- {
- return _label;
- }
- else if (_value != null && _value.length() > 0)
- {
- return _value;
- }
- else if (_description != null && _description.length() > 0)
- {
- return _description;
- }
- else if (_itemValue != null && _itemValue.length() > 0)
- {
- return _itemValue;
- }
- else
- {
- return "SelectItem";
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectManyListboxTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectManyListboxTagConverter.java
deleted file mode 100644
index abc3ab6..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectManyListboxTagConverter.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfhtml;
-
-import java.util.List;
-
-import org.w3c.dom.Element;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class SelectManyListboxTagConverter extends SelectBasedTagConverter
-{
-
- /**
- * @param host
- */
- public SelectManyListboxTagConverter(Element host)
- {
- super(host);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.jsfhtml.SelectBasedTagConverter#handleMultipleAndSize(org.w3c.dom.Element, org.w3c.dom.Element)
- */
- protected void handleMultipleAndSize(Element hostEle, Element selectEle)
- {
- // If the component is a UISelectMany instance, render "multiple" as the value of the
- // "multiple" attribute.
- selectEle.setAttribute("multiple", "multiple");
-
- // If the "size" attribute is specified, render its value as the value of the "size"
- // attribute. Otherwise use the number of items as the value of the "size" attribute.
- String sizeattr = hostEle.getAttribute("size");
-
- List selectItems = this.getSelectItems(hostEle);
- if (sizeattr == null)
- {
- if (!selectItems.isEmpty())
- {
- selectEle.setAttribute("size", String.valueOf(selectItems.size()));
- }
- }
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectManyMenuTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectManyMenuTagConverter.java
deleted file mode 100644
index e6ead1f..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectManyMenuTagConverter.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfhtml;
-
-import org.w3c.dom.Element;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class SelectManyMenuTagConverter extends SelectBasedTagConverter
-{
-
- /**
- * @param host
- */
- public SelectManyMenuTagConverter(Element host)
- {
- super(host);
- // TODO Auto-generated constructor stub
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.jsfhtml.SelectBasedTagConverter#handleMultipleAndSize(org.w3c.dom.Element, org.w3c.dom.Element)
- */
- protected void handleMultipleAndSize(Element hostEle, Element selectEle)
- {
- // If the component is a UISelectMany instance, render "multiple" as the value of the
- // "multiple" attribute.
- selectEle.setAttribute("multiple", "multiple");
-
- // If the "size" attribute is specified, render its value as the value of the "size"
- // attribute. Otherwise use the number of items as the value of the "size" attribute.
- selectEle.setAttribute("size", "1");
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectOneListboxTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectOneListboxTagConverter.java
deleted file mode 100644
index e1a0493..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectOneListboxTagConverter.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfhtml;
-
-import java.util.List;
-
-import org.w3c.dom.Element;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class SelectOneListboxTagConverter extends SelectBasedTagConverter
-{
-
- /**
- * @param host
- */
- public SelectOneListboxTagConverter(Element host)
- {
- super(host);
- // TODO Auto-generated constructor stub
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.jsfhtml.SelectBasedTagConverter#handleMultipleAndSize(org.w3c.dom.Element, org.w3c.dom.Element)
- */
- protected void handleMultipleAndSize(Element hostEle, Element selectEle)
- {
- // always not multiple
- selectEle.removeAttribute("multiple");
-
- // If the "size" attribute is specified, render its value as the value of the "size"
- // attribute. Otherwise use the number of items as the value of the "size" attribute.
- String sizeattr = hostEle.getAttribute("size");
-
- List selectItems = this.getSelectItems(hostEle);
- if (sizeattr == null)
- {
- if (!selectItems.isEmpty())
- {
- selectEle.setAttribute("size", String.valueOf(selectItems.size()));
- }
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectOneMenuTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectOneMenuTagConverter.java
deleted file mode 100644
index 1bb5db4..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectOneMenuTagConverter.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfhtml;
-
-import org.w3c.dom.Element;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class SelectOneMenuTagConverter extends SelectBasedTagConverter
-{
-
- /**
- * @param host
- */
- public SelectOneMenuTagConverter(Element host)
- {
- super(host);
- // TODO Auto-generated constructor stub
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.jsfhtml.SelectBasedTagConverter#handleMultipleAndSize(org.w3c.dom.Element, org.w3c.dom.Element)
- */
- protected void handleMultipleAndSize(Element hostEle, Element selectEle)
- {
- // always not multiple
- selectEle.removeAttribute("multiple");
-
- selectEle.setAttribute("size", "1");
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectTagConverter.java
deleted file mode 100644
index 0beeac4..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectTagConverter.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfhtml;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.converter.AbstractTagConverter;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * This class is supposed to be common parent class for the different selectMany tags.
- *
- * @author mengbo
- * @version 1.5
- */
-public abstract class SelectTagConverter extends AbstractTagConverter
-{
- /**
- * @param host
- */
- public SelectTagConverter(Element host)
- {
- super(host);
- }
-
- /**
- * Return a list of SelectItem
- *
- * @param parent
- * @return the select item list for parent
- */
- protected List getSelectItems(Element parent)
- {
- List result = new ArrayList();
- NodeList nl = parent.getChildNodes();
- for (int i = 0, size = nl.getLength(); i < size; i++)
- {
- Node child = nl.item(i);
- if (child instanceof Element)
- {
- Element ele = (Element) child;
- String tagname = ele.getLocalName();
- if (IJSFConstants.TAG_SELECTITEM.equalsIgnoreCase(tagname))
- {
- SelectItemModel item = new SelectItemModel();
- item.setDescription(ele.getAttribute(IJSFConstants.ATTR_ITEMDESCRIPTION));
- item.setLabel(ele.getAttribute(IJSFConstants.ATTR_ITEMLABEL));
- item.setItemValue(ele.getAttribute(IJSFConstants.ATTR_ITEMVALUE));
- item.setValue(ele.getAttribute(IJSFConstants.ATTR_VALUE));
- item.setId(ele.getAttribute(IJSFConstants.ATTR_ID));
- item.setDisabled("true".equalsIgnoreCase(ele.getAttribute(IJSFConstants.ATTR_ITEMDISABLED)));
- result.add(item);
- }
- else if (IJSFConstants.TAG_SELECTITEMS.equalsIgnoreCase(tagname))
- {
- // as selectItems can only be resolved at run time, so we just emulate
- // as if it map to two selectitem
- String value = ele.getAttribute(IJSFConstants.ATTR_VALUE);
- if (value == null || value.length() == 0)
- {
- value = IJSFConstants.ATTR_VALUE;
- }
- SelectItemModel item1 = new SelectItemModel();
- item1.setValue(value + "_1");
- item1.setId(ele.getAttribute(IJSFConstants.ATTR_ID));
- result.add(item1);
- SelectItemModel item2 = new SelectItemModel();
- item2.setValue(value + "_2");
- item2.setId(ele.getAttribute(IJSFConstants.ATTR_ID));
- result.add(item2);
- }
- }
- }
-
- return result;
- }
-
- /**
- * @param parent
- * @return the select item model for parent
- */
- public SelectItemModel getDefault(Element parent)
- {
- SelectItemModel item = new SelectItemModel();
- if (parent.getLocalName().equals(IJSFConstants.TAG_SELECTONERADIO))
- {
- item.setLabel("radio");
- }
- else if (parent.getLocalName().equals(IJSFConstants.TAG_SELECTMANYCHECKBOX))
- {
- item.setLabel("checkBox");
- }
- else
- {
- item.setLabel(parent.getLocalName());
- }
- return item;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isMultiLevel()
- */
- public boolean isMultiLevel()
- {
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isWidget()
- */
- public boolean isWidget()
- {
- return true;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/TableBasedSelectTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/TableBasedSelectTagConverter.java
deleted file mode 100644
index 043b82d..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/TableBasedSelectTagConverter.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfhtml;
-
-import java.util.List;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.IHTMLConstants;
-import org.eclipse.jst.pagedesigner.converter.ConverterUtil;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class TableBasedSelectTagConverter extends SelectTagConverter
-{
-
- private String _inputType;
-
- /**
- * @param host
- * @param inputType
- */
- public TableBasedSelectTagConverter(Element host, String inputType)
- {
- super(host);
- this._inputType = inputType;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.AbstractTagConverter#doConvertRefresh()
- */
- protected Element doConvertRefresh()
- {
- Element hostEle = getHostElement();
-
- // Render a "table" element.
- Element tableEle = createElement(IHTMLConstants.TAG_TABLE);
-
- // If the "styleClass" is specified, render the value of the "styleClass"
- // attribute as the value of the "class" attribute on the "table" element.
- ConverterUtil.copyAttribute(hostEle, IJSFConstants.ATTR_STYLECLASS, tableEle, IHTMLConstants.ATTR_CLASS);
-
- // If the "style", "border" attributes are specified, pass them thru.
- ConverterUtil.copyAttribute(hostEle, IJSFConstants.ATTR_STYLE, tableEle, IHTMLConstants.ATTR_STYLE);
- ConverterUtil.copyAttribute(hostEle, IJSFConstants.ATTR_BORDER, tableEle, IHTMLConstants.ATTR_BORDER);
-
- // If the "layout" attribute is specified, and its value is "pageDirection",
- // render the children elements vertically, otherwise horizontally, in the table.
- boolean horizontal = true;
- if ("pageDirection".equalsIgnoreCase(hostEle.getAttribute(IJSFConstants.ATTR_LAYOUT)))
- {
- horizontal = false;
- }
-
- Element itemContainer;
- if (horizontal)
- {
- itemContainer = createElement(IHTMLConstants.TAG_TR);
- tableEle.appendChild(itemContainer);
- }
- else
- {
- itemContainer = tableEle;
- }
-
- // XXX: If any of the children are an instance of SelectItemGroup, render them as a
- // nested table.
- // but at design time, we don't know anything about SelectItemGroup. so will not
- // rendering nested table.
-
- List selectitems = this.getSelectItems(hostEle);
-
- // for designer, if there is no item, we still want to render one
- if (this.isDesignerMode() && selectitems.isEmpty())
- {
- SelectItemModel item = getDefault(hostEle);
- selectitems.add(item);
- }
-
- boolean isDisabled = Boolean.TRUE.toString()
- .equalsIgnoreCase(hostEle.getAttribute(IJSFConstants.ATTR_DISABLED));
- boolean isReadonly = Boolean.TRUE.toString()
- .equalsIgnoreCase(hostEle.getAttribute(IJSFConstants.ATTR_READONLY));
-
- for (int i = 0, size = selectitems.size(); i < size; i++)
- {
- SelectItemModel item = (SelectItemModel) selectitems.get(i);
- // Each of the children are ultimately rendererd as follows.
- // Render a "label" element. Inside of the "label", render an "input" element
- // of "type" "checkbox" for each child component.
- Element labelEle = createElement(IHTMLConstants.TAG_LABEL);
- Element inputEle = createElement(IHTMLConstants.TAG_INPUT);
- inputEle.setAttribute(IHTMLConstants.ATTR_TYPE, getInputType());
- if (isDisabled || item.isDisabled())
- {
- inputEle.setAttribute(IHTMLConstants.ATTR_DISABLED, "disabled");
- }
- if (isReadonly)
- {
- inputEle.setAttribute(IHTMLConstants.ATTR_READONLY, "readonly");
- }
-
- // As an exception to the general
- // rules about how to handle the "id" attribute, render it as an attribute on
- // the outer "table" element, the value of which is the clientId of the component
- // per the rules at the beginning of this specification.The "id" attribute must
- // not be output on each "input" element.
- if (item.getId() != null)
- {
- labelEle.setAttribute(IHTMLConstants.ATTR_ID, item.getId());
- }
-
- // The value of the current SelectItem
- // is rendered as the value of the "value" attribute. If the value of the enclosing
- // UISelectMany matches the current value, render "checked" as the value of the
- // "checked" attribute. If the current SelectItem.isDisabled() returns true,
- // render "disabled" as the value of the "disabled" attribute.
- if (item.getValue() != null)
- {
- inputEle.setAttribute(IHTMLConstants.ATTR_VALUE, item.getValue());
- }
- // XXX: checked and disabled is not handled.
-
- // Close out the "input" element and render the return value from
- // SelectItem.getLabel(). Close out the "label" element and any other nested elements.
- Text label = createText(item.getDisplayString());
-
- labelEle.appendChild(inputEle);
- labelEle.appendChild(label);
-
- if (horizontal)
- {
- Element td = createElement(IHTMLConstants.TAG_TD);
- td.appendChild(labelEle);
- itemContainer.appendChild(td);
- }
- else
- {
- Element tr = createElement(IHTMLConstants.TAG_TR);
- Element td = createElement(IHTMLConstants.TAG_TD);
- tr.appendChild(td);
- td.appendChild(labelEle);
- itemContainer.appendChild(tr);
- }
- }
-
- return (tableEle);
- }
-
- /**
- * @return the input type
- */
- protected String getInputType()
- {
- return _inputType;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.AbstractTagConverter#needBorderDecorator()
- */
- public boolean needBorderDecorator()
- {
- return true;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/ColumnOperation.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/ColumnOperation.java
deleted file mode 100644
index 2d5c3b9..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/ColumnOperation.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * 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:
- * Ian Trimble - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import org.eclipse.jst.pagedesigner.converter.ConvertPosition;
-import org.eclipse.jst.pagedesigner.dom.EditModelQuery;
-import org.eclipse.jst.pagedesigner.dtmanager.converter.ITransformOperation;
-import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.AbstractTransformOperation;
-import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.TransformOperationFactory;
-import org.eclipse.jst.pagedesigner.jsf.core.dom.JSFDOMUtil;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * ITransformOperation implementation specifically for the "column" JSF (HTML)
- * Element.
- *
- * <br><b>Note:</b> requires ITransformOperation.setTagConverterContext(...) to
- * have been called to provide a valid ITagConverterContext instance prior to
- * a call to the transform(...) method.
- *
- * @author Ian Trimble - Oracle
- */
-public class ColumnOperation extends AbstractTransformOperation {
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional.AbstractTransformOperation#transform(org.w3c.dom.Element, org.w3c.dom.Element)
- */
- public Element transform(Element srcElement, Element curElement) {
-
- //create "td" Element
- Element tdElement = createElement("td");
-
- //get parent Node
- Node parentNode = srcElement.getParentNode();
-
- //process if parentNode is a "dataTable" Element
- if (parentNode != null && parentNode.getNodeType() == Node.ELEMENT_NODE && parentNode.getLocalName().equals("dataTable")) {
- //tokenize "columnClasses" attribute into a List
- List columnClassesList = new ArrayList();
- String columnClassesAttribute = ((Element)parentNode).getAttribute("columnClasses");
- if (columnClassesAttribute != null && columnClassesAttribute.length() > 0) {
- StringTokenizer tokenizer = new StringTokenizer(columnClassesAttribute, ", ");
- while (tokenizer.hasMoreTokens()) {
- columnClassesList.add(tokenizer.nextToken());
- }
- }
- //set "class" attribute
- int offset = EditModelQuery.getInstance().getSameTypeNodeIndex(srcElement);
- if (offset < columnClassesList.size()) {
- ITransformOperation operation =
- TransformOperationFactory.getInstance().getTransformOperation(
- TransformOperationFactory.OP_CreateAttributeOperation,
- new String[]{"class", (String)columnClassesList.get(offset)});
- operation.transform(srcElement, tdElement);
- }
- }
-
- //add non-transparent (?), non-facet children (for further processing)
- if (EditModelQuery.getInstance().hasNonTransparentChild(srcElement, new String[] {"facet"})) {
- Node childNode = srcElement.getFirstChild();
- int index = 0;
- while (childNode != null) {
- if (!(childNode instanceof Element) || !JSFDOMUtil.isFacet((Element)childNode)) {
- tagConverterContext.addChild(childNode, new ConvertPosition(tdElement, index++));
- }
- childNode = childNode.getNextSibling();
- }
- } else {
- //append single space for esthetics of the "td" Element
- appendChildText(" ", tdElement);
- }
-
- return tdElement;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/DataTableOperation.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/DataTableOperation.java
deleted file mode 100644
index 3d0461b..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/DataTableOperation.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * 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:
- * Ian Trimble - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import org.eclipse.jst.pagedesigner.converter.ConvertPosition;
-import org.eclipse.jst.pagedesigner.dtmanager.converter.ITransformOperation;
-import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.AbstractTransformOperation;
-import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.TransformOperationFactory;
-import org.w3c.dom.Element;
-
-/**
- * ITransformOperation implementation specifically for the "dataTable" JSF
- * (HTML) Element.
- *
- * <br><b>Note:</b> requires ITransformOperation.setTagConverterContext(...) to
- * have been called to provide a valid ITagConverterContext instance prior to
- * a call to the transform(...) method.
- *
- * @author Ian Trimble - Oracle
- */
-public class DataTableOperation extends AbstractTransformOperation {
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional.AbstractTransformOperation#transform(org.w3c.dom.Element, org.w3c.dom.Element)
- */
- public Element transform(Element srcElement, Element curElement) {
- Element tableElement = null;
- //create table element, copy all attributes, rename "styleClass" attribute to "class"
- tableElement = createElement("table");
- ITransformOperation operation =
- TransformOperationFactory.getInstance().getTransformOperation(
- TransformOperationFactory.OP_CopyAllAttributesOperation,
- new String[]{});
- operation.transform(srcElement, tableElement);
- operation =
- TransformOperationFactory.getInstance().getTransformOperation(
- TransformOperationFactory.OP_RenameAttributeOperation,
- new String[]{"styleClass", "class"});
- operation.transform(srcElement, tableElement);
- //build thead
- buildHeaderOrFooter(srcElement, tableElement, true);
- //build tbody
- buildBody(srcElement, tableElement);
- //build tfoot
- buildHeaderOrFooter(srcElement, tableElement, false);
- return tableElement;
- }
-
- private void buildHeaderOrFooter(Element srcElement, Element tableElement, boolean isHeader) {
- //setup vars depending on whether we are building thead or tfoot
- String facetName = isHeader ? "header" : "footer";
- String headerOrFooterTagName = isHeader ? "thead" : "tfoot";
- String thOrTdTagName = isHeader ? "th" : "td";
- String headerClassOrFooterClassAttrName = isHeader ? "headerClass" : "footerClass";
-
- //look for facet ("header" or "footer")
- Element facetElement = getChildFacetByName(srcElement, facetName);
-
- //get list of child "column" elements
- List columnElementList = getChildElements(srcElement, "column");
-
- //look for facet ("header" or "footer") on child "column" elements
- boolean hasColumnFacet = false;
- Iterator itColumnElementList = columnElementList.iterator();
- while (itColumnElementList.hasNext()) {
- Element columnElement = (Element)itColumnElementList.next();
- Element columnFacet = getChildFacetByName(columnElement, facetName);
- if (columnFacet != null) {
- hasColumnFacet = true;
- break;
- }
- }
-
- //test if we even need to build header or footer
- if (facetElement == null && !hasColumnFacet) {
- return;
- }
-
- //append "thead" or "tfoot" Element
- Element headerOrFooterElement = appendChildElement(headerOrFooterTagName, tableElement);
-
- //if facetElement exists, build appropriate thead or tfoot children
- if (facetElement != null) {
- //append "tr" Element
- Element trElement = appendChildElement("tr", headerOrFooterElement);
- //append "th" or "td" Element
- Element thOrTdElement = appendChildElement(thOrTdTagName, trElement);
- //set "class" attribute
- String headerClassOrFooterClassAttribute = srcElement.getAttribute(headerClassOrFooterClassAttrName);
- if (headerClassOrFooterClassAttribute != null && headerClassOrFooterClassAttribute.length() > 0) {
- ITransformOperation operation =
- TransformOperationFactory.getInstance().getTransformOperation(
- TransformOperationFactory.OP_CreateAttributeOperation,
- new String[]{"class", headerClassOrFooterClassAttribute});
- operation.transform(srcElement, thOrTdElement);
- }
- //set "colspan" attribute
- if (columnElementList.size() > 0) {
- ITransformOperation operation =
- TransformOperationFactory.getInstance().getTransformOperation(
- TransformOperationFactory.OP_CreateAttributeOperation,
- new String[]{"colspan", String.valueOf(columnElementList.size())});
- operation.transform(srcElement, thOrTdElement);
- }
- //add facet Element as child (to be processed further)
- tagConverterContext.addChild(facetElement, new ConvertPosition(thOrTdElement, 0));
- }
-
- //if any child column has "header" or "footer" facet, build "tr" element
- if (hasColumnFacet) {
- //append "tr" Element
- Element trElement = appendChildElement("tr", headerOrFooterElement);
- //iterate through columnElementList
- itColumnElementList = columnElementList.iterator();
- while (itColumnElementList.hasNext()) {
- Element columnElement = (Element)itColumnElementList.next();
- //get "header" or "footer" facet of column
- Element columnFacet = getChildFacetByName(columnElement, facetName);
- //append "th" or "td" Element
- Element thOrTdElement = appendChildElement(thOrTdTagName, trElement);
- //set "class" attribute
- String headerClassOrFooterClassAttribute = srcElement.getAttribute(headerClassOrFooterClassAttrName);
- if (headerClassOrFooterClassAttribute != null && headerClassOrFooterClassAttribute.length() > 0) {
- ITransformOperation operation =
- TransformOperationFactory.getInstance().getTransformOperation(
- TransformOperationFactory.OP_CreateAttributeOperation,
- new String[]{"class", headerClassOrFooterClassAttribute});
- operation.transform(srcElement, thOrTdElement);
- }
- //if facet exists, add facet Element as child (to be processed further)
- if (columnFacet != null) {
- tagConverterContext.addChild(columnFacet, new ConvertPosition(thOrTdElement, 0));
- }
- }
- }
- }
-
- private void buildBody(Element srcElement, Element tableElement) {
- //append "tbody" element
- Element tbodyElement = appendChildElement("tbody", tableElement);
- //append "tr" element
- Element trElement = appendChildElement("tr", tbodyElement);
- //parse "rowClasses" attribute and set "class" attribute
- String rowClassesAttribute = srcElement.getAttribute("rowClasses");
- if (rowClassesAttribute != null && rowClassesAttribute.length() > 0) {
- StringTokenizer tokenizer = new StringTokenizer(rowClassesAttribute, ", ");
- if (tokenizer.hasMoreTokens()) {
- ITransformOperation operation =
- TransformOperationFactory.getInstance().getTransformOperation(
- TransformOperationFactory.OP_CreateAttributeOperation,
- new String[]{"class", tokenizer.nextToken()});
- operation.transform(srcElement, trElement);
- }
- }
- //add child columns (to be processed further)
- List columnElementList = getChildElements(srcElement, "column");
- Iterator itColumnElementList = columnElementList.iterator();
- int index = 0;
- while (itColumnElementList.hasNext()) {
- Element columnElement = (Element)itColumnElementList.next();
- tagConverterContext.addChild(columnElement, new ConvertPosition(trElement, index++));
- }
- }
-
- /**
- * Gets a child Element of the specified parent Element that has the node
- * name "facet" and the specified value of the "name" attribute.
- *
- * @param srcElement Parent Element instance.
- * @param facetName Name of the facet Element for which to search.
- * @return Child Element that is a facet with the specified name.
- */
- private Element getChildFacetByName(Element srcElement, String facetName) {
- Element element = null;
- List facets = getChildElements(srcElement, "facet");
- Iterator itFacets = facets.iterator();
- while (itFacets.hasNext()) {
- Element facet = (Element)itFacets.next();
- if (facet.getAttribute("name").equals(facetName)) {
- element = facet;
- break;
- }
- }
- return element;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/LoadBundleOperation.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/LoadBundleOperation.java
deleted file mode 100644
index 4299133..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/LoadBundleOperation.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * 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:
- * Ian Trimble - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.PropertyResourceBundle;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.jsf.common.ui.IFileFolderConstants;
-import org.eclipse.jst.jsf.common.ui.internal.utils.ResourceUtils;
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.PDPlugin;
-import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.AbstractTransformOperation;
-import org.eclipse.jst.pagedesigner.utils.PreviewUtil;
-import org.eclipse.jst.pagedesigner.utils.StructuredModelUtil;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Element;
-
-/**
- * ITransformOperation implementation specifically for the "loadBundle" JSF
- * (core) Element.
- *
- * @author Ian Trimble - Oracle
- */
-public class LoadBundleOperation extends AbstractTransformOperation {
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional.AbstractTransformOperation#transform(org.w3c.dom.Element, org.w3c.dom.Element)
- */
- public Element transform(Element srcElement, Element curElement) {
- if (srcElement != null) {
- //get "var" and "basename" attributes of srcElement
- String var = srcElement.getAttribute(IJSFConstants.ATTR_VAR);
- String basename = srcElement.getAttribute(IJSFConstants.ATTR_BASENAME);
- if (var != null && basename != null && var.length() > 0 && basename.length() > 0) {
- String basePath =
- basename.replace('.', IFileFolderConstants.PATH_SEPARATOR.charAt(0)) +
- IFileFolderConstants.DOT +
- IFileFolderConstants.EXT_PROPERTIES;
- if (srcElement instanceof IDOMNode) {
- //get model
- IDOMModel model = ((IDOMNode)srcElement).getModel();
- if (model != null) {
- //get project
- IProject project = StructuredModelUtil.getProjectFor(model);
- if (project != null) {
- //attempt to locate properties file in "/{WebRoot}/WEB-INF/classes"
- IVirtualComponent component = ComponentCore.createComponent(project);
- IPath webRootPath = component.getRootFolder().getProjectRelativePath();
- StringBuffer sb = new StringBuffer(webRootPath.toString());
- sb.append(IFileFolderConstants.PATH_SEPARATOR);
- sb.append(IFileFolderConstants.FOLDER_WEBINF);
- sb.append(IFileFolderConstants.PATH_SEPARATOR);
- sb.append(IFileFolderConstants.FOLDER_CLASS);
- sb.append(IFileFolderConstants.PATH_SEPARATOR);
- sb.append(basePath);
- IResource resource = project.findMember(sb.toString());
- if (resource == null) {
- resource = findFileInSrcFolder(project, basePath);
- if (resource != null) {
- //load properties file and configure PreviewUtil
- InputStream inputStream = null;
- try {
- File file = new File(resource.getLocation().toString());
- inputStream = new FileInputStream(file);
- if (inputStream != null) {
- inputStream = new BufferedInputStream(inputStream);
- PropertyResourceBundle bundle = new PropertyResourceBundle(inputStream);
- if (bundle != null) {
- if (PreviewUtil.getBUNDLE_MAP() == null) {
- PreviewUtil.setBUNDLE_MAP(new HashMap());
- } else {
- PreviewUtil.getBUNDLE_MAP().clear();
- }
- PreviewUtil.getBUNDLE_MAP().put(var, bundle);
- PreviewUtil.setBUNDLE(bundle);
- PreviewUtil.setVAR(var);
- }
- }
- } catch(IOException ioe) {
- PDPlugin.getLogger(LoadBundleOperation.class).error("LoadBundleTagConverter.convertRefresh.IOException", ioe);
- } finally {
- ResourceUtils.ensureClosed(inputStream);
- }
- }
- }
- }
- }
- }
- }
- }
- //return null to indicate there is no HTML element associated with this tag
- return null;
- }
-
- /**
- * Find specified file in any source folder of the specified project.
- *
- * @param project IProject instance.
- * @param filePath Source folder-relative path of the file to be located.
- * @return the specified file in any source folder of the specified project.
- */
- protected IResource findFileInSrcFolder(IProject project, String filePath) {
- IResource resource = null;
- IJavaProject javaProject = JavaCore.create(project);
- if (javaProject != null) {
- try {
- IClasspathEntry[] classpathEntries = javaProject.getResolvedClasspath(true);
- for (int i = 0; i < classpathEntries.length; i++) {
- IClasspathEntry classpathEntry = classpathEntries[i];
- if (classpathEntry.getEntryKind() == IClasspathEntry.CPE_SOURCE) {
- IPath srcPath = classpathEntry.getPath();
- //srcPath = srcPath.removeFirstSegments(srcPath.matchingFirstSegments(project.getFullPath()));
- IPath srcFilePath = srcPath.append(filePath);
- IResource tmpResource = project.getParent().findMember(srcFilePath);
- if (tmpResource != null) {
- resource = tmpResource;
- break;
- }
- }
- }
- } catch(JavaModelException jme) {
- //ignore - returning null from method will indicate failure
- }
- }
- return resource;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/PanelGridOperation.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/PanelGridOperation.java
deleted file mode 100644
index 0ebb2fc..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/PanelGridOperation.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * 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:
- * Ian Trimble - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import org.eclipse.jst.pagedesigner.converter.ConvertPosition;
-import org.eclipse.jst.pagedesigner.dtmanager.converter.ITransformOperation;
-import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.AbstractTransformOperation;
-import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.TransformOperationFactory;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * ITransformOperation implementation specifically for the "panelGrid" JSF
- * (HTML) Element.
- *
- * <br><b>Note:</b> requires ITransformOperation.setTagConverterContext(...) to
- * have been called to provide a valid ITagConverterContext instance prior to
- * a call to the transform(...) method.
- *
- * @author Ian Trimble - Oracle
- */
-public class PanelGridOperation extends AbstractTransformOperation {
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional.AbstractTransformOperation#transform(org.w3c.dom.Element, org.w3c.dom.Element)
- */
- public Element transform(Element srcElement, Element curElement) {
- Element tableElement = null;
- //create table element, copy all attributes, rename "styleClass" attribute to "class"
- tableElement = createElement("table");
- ITransformOperation operation =
- TransformOperationFactory.getInstance().getTransformOperation(
- TransformOperationFactory.OP_CopyAllAttributesOperation,
- new String[]{});
- operation.transform(srcElement, tableElement);
- operation =
- TransformOperationFactory.getInstance().getTransformOperation(
- TransformOperationFactory.OP_RenameAttributeOperation,
- new String[]{"styleClass", "class"});
- operation.transform(srcElement, tableElement);
- //get value of "columns" attribute
- int columns;
- try {
- columns = Integer.parseInt(srcElement.getAttribute("columns"));
- } catch(NumberFormatException nfe) {
- columns = 1;
- }
- if (columns < 1) {
- columns = 1;
- }
- //check for "header" facet and render appropriately
- Element headerFacetElement = getChildFacetByName(srcElement, "header");
- if (headerFacetElement != null) {
- Element tHeadElement = appendChildElement("thead", tableElement);
- Element trElement = appendChildElement("tr", tHeadElement);
- Element thElement = appendChildElement("th", trElement);
- String headerClass = srcElement.getAttribute("headerClass");
- if (headerClass != null && headerClass.length() > 0) {
- operation =
- TransformOperationFactory.getInstance().getTransformOperation(
- TransformOperationFactory.OP_CreateAttributeOperation,
- new String[]{"class", headerClass});
- operation.transform(srcElement, thElement);
- }
- operation =
- TransformOperationFactory.getInstance().getTransformOperation(
- TransformOperationFactory.OP_CreateAttributeOperation,
- new String[]{"colspan", String.valueOf(columns)});
- operation.transform(srcElement, thElement);
- tagConverterContext.addChild(headerFacetElement, new ConvertPosition(thElement, 0));
- }
- //check for "footer" facet and render appropriately
- Element footerFacetElement = getChildFacetByName(srcElement, "footer");
- if (footerFacetElement != null) {
- Element tFootElement = appendChildElement("tfoot", tableElement);
- Element trElement = appendChildElement("tr", tFootElement);
- Element tdElement = appendChildElement("td", trElement);
- String footerClass = srcElement.getAttribute("footerClass");
- if (footerClass != null && footerClass.length() > 0) {
- operation =
- TransformOperationFactory.getInstance().getTransformOperation(
- TransformOperationFactory.OP_CreateAttributeOperation,
- new String[]{"class", footerClass});
- operation.transform(srcElement, tdElement);
- }
- operation =
- TransformOperationFactory.getInstance().getTransformOperation(
- TransformOperationFactory.OP_CreateAttributeOperation,
- new String[]{"colspan", String.valueOf(columns)});
- operation.transform(srcElement, tdElement);
- tagConverterContext.addChild(footerFacetElement, new ConvertPosition(tdElement, 0));
- }
- //get rowClasses and columnClasses for subsequent processing
- List rowClasses = new ArrayList();
- String rowClassesAttribute = srcElement.getAttribute("rowClasses");
- if (rowClassesAttribute != null && rowClassesAttribute.length() > 0) {
- StringTokenizer tokenizer = new StringTokenizer(rowClassesAttribute, ", ");
- while (tokenizer.hasMoreTokens()) {
- rowClasses.add(tokenizer.nextToken());
- }
- }
- List columnClasses = new ArrayList();
- String columnClassAttribute = srcElement.getAttribute("columnClasses");
- if (columnClassAttribute != null) {
- StringTokenizer tokenizer = new StringTokenizer(columnClassAttribute, ", ");
- while (tokenizer.hasMoreTokens()) {
- columnClasses.add(tokenizer.nextToken());
- }
- }
- //render children using appropriate number of columns and appropriate classes
- Element tBodyElement = appendChildElement("tbody", tableElement);
- List childElements = getChildElementsSkipFacets(srcElement);
- Element trElement = null;
- int nextRow = 0;
- int curIndex = 0;
- Iterator itChildElements = childElements.iterator();
- while (itChildElements.hasNext()) {
- int columnIndex = curIndex % columns;
- if (columnIndex == 0) {
- trElement = appendChildElement("tr", tBodyElement);
- if (!rowClasses.isEmpty()) {
- operation =
- TransformOperationFactory.getInstance().getTransformOperation(
- TransformOperationFactory.OP_CreateAttributeOperation,
- new String[]{"class", (String)rowClasses.get(nextRow)});
- operation.transform(srcElement, trElement);
- nextRow = (nextRow + 1) % rowClasses.size();
- }
- }
- Element tdElement = appendChildElement("td", trElement);
- if (columnIndex < columnClasses.size()) {
- operation =
- TransformOperationFactory.getInstance().getTransformOperation(
- TransformOperationFactory.OP_CreateAttributeOperation,
- new String[]{"class", (String)columnClasses.get(columnIndex)});
- operation.transform(srcElement, tdElement);
- }
- tagConverterContext.addChild((Element)itChildElements.next(), new ConvertPosition(tdElement, 0));
- curIndex++;
- }
- return tableElement;
- }
-
- /**
- * Gets a child Element of the specified parent Element that has the node
- * name "facet" and the specified value of the "name" attribute.
- *
- * @param srcElement Parent Element instance.
- * @param facetName Name of the facet Element for which to search.
- * @return Child Element that is a facet with the specified name.
- */
- private Element getChildFacetByName(Element srcElement, String facetName) {
- Element element = null;
- List facets = getChildElements(srcElement, "facet");
- Iterator itFacets = facets.iterator();
- while (itFacets.hasNext()) {
- Element facet = (Element)itFacets.next();
- String facetAttrName = facet.getAttribute("name");
- if (facetAttrName != null && facetAttrName.equals(facetName)) {
- element = facet;
- break;
- }
- }
- return element;
- }
-
- /**
- * Gets a list of child Elements of the specified parent Element, skipping
- * any "facet" Elements.
- *
- * @param srcElement Parent Element instance.
- * @return List of child Elements of the specified parent Element that does
- * not include any child "facet" Elements.
- */
- private List getChildElementsSkipFacets(Element srcElement) {
- List childElementsList = new ArrayList();
- NodeList childNodes = srcElement.getChildNodes();
- for (int i = 0; i < childNodes.getLength(); i++) {
- Node childNode = childNodes.item(i);
- if (childNode.getNodeType() == Node.ELEMENT_NODE) {
- if (!childNode.getLocalName().equals("facet")) {
- childElementsList.add(childNode);
- }
- }
- }
- return childElementsList;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/SelectManyCheckboxOperation.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/SelectManyCheckboxOperation.java
deleted file mode 100644
index 5497bbf..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/SelectManyCheckboxOperation.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * 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:
- * Ian Trimble - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf;
-
-/**
- * ITransformOperation implementation specifically for the "selectManyCheckbox"
- * JSF (HTML) Element.
- *
- * <br><b>Note:</b> requires ITransformOperation.setTagConverterContext(...) to
- * have been called to provide a valid ITagConverterContext instance prior to
- * a call to the transform(...) method.
- *
- * @author Ian Trimble - Oracle
- */
-public class SelectManyCheckboxOperation extends TableBasedOperation {
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf.TableBasedOperation#getInputType()
- */
- protected String getInputType() {
- return "checkbox";
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/SelectOneRadioOperation.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/SelectOneRadioOperation.java
deleted file mode 100644
index 891c060..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/SelectOneRadioOperation.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * 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:
- * Ian Trimble - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf;
-
-/**
- * ITransformOperation implementation specifically for the "selectOneRadio"
- * JSF (HTML) Element.
- *
- * <br><b>Note:</b> requires ITransformOperation.setTagConverterContext(...) to
- * have been called to provide a valid ITagConverterContext instance prior to
- * a call to the transform(...) method.
- *
- * @author Ian Trimble - Oracle
- */
-public class SelectOneRadioOperation extends TableBasedOperation {
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf.TableBasedOperation#getInputType()
- */
- protected String getInputType() {
- return "radio";
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/TableBasedOperation.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/TableBasedOperation.java
deleted file mode 100644
index e801d4d..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/TableBasedOperation.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * 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:
- * Ian Trimble - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jst.pagedesigner.dtmanager.converter.ITransformOperation;
-import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.AbstractTransformOperation;
-import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.TransformOperationFactory;
-import org.w3c.dom.Element;
-
-/**
- * Abstract ITransformOperation implementation intended as super class for HTML
- * "table"-based "selectXXX" JSF (HTML) Elements.
- *
- * <br><b>Note:</b> requires ITransformOperation.setTagConverterContext(...) to
- * have been called to provide a valid ITagConverterContext instance prior to
- * a call to the transform(...) method.
- *
- * @author Ian Trimble - Oracle
- */
-public abstract class TableBasedOperation extends AbstractTransformOperation {
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional.AbstractTransformOperation#transform(org.w3c.dom.Element, org.w3c.dom.Element)
- */
- public Element transform(Element srcElement, Element curElement) {
- Element tableElement = createElement("table");
- ITransformOperation operation =
- TransformOperationFactory.getInstance().getTransformOperation(
- TransformOperationFactory.OP_CopyAttributeOperation,
- new String[]{"styleClass"});
- operation.transform(srcElement, tableElement);
- operation =
- TransformOperationFactory.getInstance().getTransformOperation(
- TransformOperationFactory.OP_RenameAttributeOperation,
- new String[]{"styleClass", "class"});
- operation.transform(srcElement, tableElement);
- operation =
- TransformOperationFactory.getInstance().getTransformOperation(
- TransformOperationFactory.OP_CopyAttributeOperation,
- new String[]{"style"});
- operation.transform(srcElement, tableElement);
- operation =
- TransformOperationFactory.getInstance().getTransformOperation(
- TransformOperationFactory.OP_CopyAttributeOperation,
- new String[]{"border"});
- operation.transform(srcElement, tableElement);
- boolean layoutHorizontal = true;
- if ("pageDirection".equalsIgnoreCase(srcElement.getAttribute("layout"))) {
- layoutHorizontal = false;
- }
- Element itemContainer;
- if (layoutHorizontal) {
- itemContainer = appendChildElement("tr", tableElement);
- } else {
- itemContainer = tableElement;
- }
- boolean isDisabled = Boolean.TRUE.toString().equalsIgnoreCase(srcElement.getAttribute("disabled"));
- boolean isReadOnly = Boolean.TRUE.toString().equalsIgnoreCase(srcElement.getAttribute("readonly"));
- List selectItemList = getChildElements(srcElement, "selectItem");
- Iterator itSelectItemList = selectItemList.iterator();
- while (itSelectItemList.hasNext()) {
- Element selectItem = (Element) itSelectItemList.next();
- Element labelElement = createElement("label");
- Element inputElement = appendChildElement("input", labelElement);
- inputElement.setAttribute("type", getInputType());
- if (isDisabled || Boolean.TRUE.toString().equalsIgnoreCase(selectItem.getAttribute("itemDisabled"))) {
- inputElement.setAttribute("disabled", "disabled");
- }
- if (isReadOnly) {
- inputElement.setAttribute("readonly", "readonly");
- }
- String selectItemID = selectItem.getAttribute("id");
- if (selectItemID != null && selectItemID.length() > 0) {
- inputElement.setAttribute("id", selectItemID);
- }
- String selectItemValue = selectItem.getAttribute("value");
- if (selectItemValue != null && selectItemValue.length() > 0) {
- inputElement.setAttribute("value", selectItemValue);
- }
- String label = getSelectItemLabel(selectItem);
- appendChildText(label, labelElement);
- if (layoutHorizontal) {
- Element tdElement = appendChildElement("td", itemContainer);
- tdElement.appendChild(labelElement);
- } else {
- Element trElement = appendChildElement("tr", itemContainer);
- Element tdElement = appendChildElement("td", trElement);
- tdElement.appendChild(labelElement);
- }
- }
- return tableElement;
- }
-
- /**
- * Subclasses override this in order to return the "type" attribute of
- * child "input" Elements ("checkbox" or "radio").
- *
- * @return the "type" attribute of child "input" Elements.
- */
- protected abstract String getInputType();
-
- /**
- * Attempts to get a label for the selectItem Element instance.
- *
- * @param selectItem "selectItem" source Element instance.
- * @return Label for the specified selectItem Element instance.
- */
- private String getSelectItemLabel(Element selectItem) {
- String attribute = selectItem.getAttribute("itemLabel");
- if (attribute != null && attribute.length() > 0) {
- return attribute;
- }
- attribute = selectItem.getAttribute("value");
- if (attribute != null && attribute.length() > 0) {
- return attribute;
- }
- attribute = selectItem.getAttribute("itemDescription");
- if (attribute != null && attribute.length() > 0) {
- return attribute;
- }
- attribute = selectItem.getAttribute("itemValue");
- if (attribute != null && attribute.length() > 0) {
- return attribute;
- }
- return "selectItem";
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfcore/FacetElementEdit.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfcore/FacetElementEdit.java
deleted file mode 100644
index cf5ac89..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfcore/FacetElementEdit.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.elementedit.jsfcore;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.jst.pagedesigner.elementedit.AbstractElementEdit;
-import org.eclipse.jst.pagedesigner.parts.ElementEditPart;
-import org.w3c.dom.Element;
-
-/**
- * Element edit for a f:facet
- *
- * @author cbateman
- *
- */
-public class FacetElementEdit extends AbstractElementEdit
-{
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.elementedit.AbstractElementEdit#handleModelChange(org.w3c.dom.Element, org.eclipse.jst.pagedesigner.parts.ElementEditPart)
- */
- public boolean handleModelChange(Element ele, ElementEditPart part,boolean recursive)
- {
- EditPart parent = part.getParent();
- if (parent instanceof ElementEditPart)
- {
- ((ElementEditPart) parent).refreshModelChange(recursive);
- return true;
- }
- return false;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfcore/JSFCoreElementEditFactory.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfcore/JSFCoreElementEditFactory.java
deleted file mode 100644
index 966a68b..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfcore/JSFCoreElementEditFactory.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.elementedit.jsfcore;
-
-import org.eclipse.jst.jsf.common.dom.TagIdentifier;
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.elementedit.IElementEdit;
-import org.eclipse.jst.pagedesigner.elementedit.IElementEditFactory;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class JSFCoreElementEditFactory implements IElementEditFactory
-{
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.elementedit.IElementEditFactory#createElementEdit(org.w3c.dom.Element)
- */
- public IElementEdit createElementEdit(TagIdentifier tagIdentifier)
- {
- if (IJSFConstants.TAG_IDENTIFIER_LOADBUNDLE.isSameTagType(tagIdentifier))
- {
- return new LoadBundleElementEdit();
- }
- else if(IJSFConstants.TAG_IDENTIFIER_FACET.isSameTagType(tagIdentifier))
- {
- return new FacetElementEdit();
- }
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.elementedit.IElementEditFactory#getSupportedURI()
- */
- public String getSupportedURI()
- {
- return ITLDConstants.URI_JSF_CORE;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfcore/JarEntryEditorInput.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfcore/JarEntryEditorInput.java
deleted file mode 100644
index 17ee5a4..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfcore/JarEntryEditorInput.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.elementedit.jsfcore;
-
-import org.eclipse.core.resources.IStorage;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.IEditorRegistry;
-import org.eclipse.ui.IPersistableElement;
-import org.eclipse.ui.IStorageEditorInput;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class JarEntryEditorInput implements IStorageEditorInput
-{
-
- private IStorage fJarEntryFile;
-
- /**
- * @param jarEntryFile
- */
- public JarEntryEditorInput(IStorage jarEntryFile)
- {
- fJarEntryFile = jarEntryFile;
- }
-
- /*
- */
- public boolean equals(Object obj)
- {
- if (this == obj)
- {
- return true;
- }
- if (!(obj instanceof JarEntryEditorInput))
- {
- return false;
- }
- JarEntryEditorInput other = (JarEntryEditorInput) obj;
- return fJarEntryFile.equals(other.fJarEntryFile);
- }
-
-
- @Override
- public int hashCode()
- {
- // two editor inputs are equal if their fJarEntryFile's are
- // equal. Therefore use the same criteria for hashcodes
- return fJarEntryFile.hashCode();
- }
-
- /*
- * @see IEditorInput#getPersistable()
- */
- public IPersistableElement getPersistable()
- {
- return null;
- }
-
- /*
- * @see IEditorInput#getName()
- */
- public String getName()
- {
- return fJarEntryFile.getName();
- }
-
-
- /**
- * @return the full path of the entry as a string
- */
- public String getFullPath()
- {
- return fJarEntryFile.getFullPath().toString();
- }
-
-
- /**
- * @return the file extension of this input
- */
- public String getContentType()
- {
- return fJarEntryFile.getFullPath().getFileExtension();
- }
-
- /*
- * @see IEditorInput#getToolTipText()
- */
- public String getToolTipText()
- {
- return fJarEntryFile.getFullPath().toString();
- }
-
- /*
- * @see IEditorInput#getImageDescriptor()
- */
- public ImageDescriptor getImageDescriptor()
- {
- IEditorRegistry registry = PlatformUI.getWorkbench().getEditorRegistry();
- return registry.getImageDescriptor(fJarEntryFile.getFullPath().getFileExtension());
- }
-
- /*
- * @see IEditorInput#exists()
- */
- public boolean exists()
- {
- // JAR entries can't be deleted
- return true;
- }
-
- /*
- * @see IAdaptable#getAdapter(Class)
- */
- public Object getAdapter(Class adapter)
- {
- return null;
- }
-
- /*
- * see IStorageEditorInput#getStorage()
- */
- public IStorage getStorage()
- {
- return fJarEntryFile;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfcore/LoadBundleAction.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfcore/LoadBundleAction.java
deleted file mode 100644
index 8e03cb1..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfcore/LoadBundleAction.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.elementedit.jsfcore;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IStorage;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jst.jsf.core.internal.tld.LoadBundleUtil;
-import org.eclipse.jst.pagedesigner.jsf.ui.JSFUIPlugin;
-import org.eclipse.ui.IEditorDescriptor;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorRegistry;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-
-
-/**
- * @author mengbo
- */
-public class LoadBundleAction extends Action
-{
- private String _baseName;
- private IProject _project;
-
- /**
- * Create a new action
- */
- public LoadBundleAction()
- {
- setText(JSFUIPlugin.getResourceString("ElementEdit.Submenu.LoadBundle"));//$NON-NLS-1$
- }
-
- /**
- * @param attribute
- */
- public void setBaseName(String attribute)
- {
- _baseName = attribute;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.IAction#run()
- */
- public void run()
- {
- if (_project == null || _baseName == null)
- {
- return;
- }
-
- IStorage storage = null;
- try
- {
- storage = LoadBundleUtil.getLoadBundleResource(_project, _baseName);
- }
- catch (CoreException e)
- {
- JSFUIPlugin.getAlerts().warning("Message.Warning.Title", e.getLocalizedMessage());//$NON-NLS-1$
- return;
- }
-
- if (storage instanceof IFile)
- {
- try
- {
- IDE.openEditor(getPage(), (IFile) storage, true);
- }
- catch (PartInitException e1)
- {
- JSFUIPlugin.getAlerts().warning("Message.Warning.Title", e1.getLocalizedMessage());//$NON-NLS-1$
- }
- }
- else
- {
- IEditorInput input = new JarEntryEditorInput(storage);
- try
- {
- getPage().openEditor(input, "org.eclipse.ui.DefaultTextEditor");//$NON-NLS-1$
- }
- catch (PartInitException e1)
- {
- JSFUIPlugin.getAlerts().warning("Message.Warning.Title", e1.getLocalizedMessage());//$NON-NLS-1$
- }
- }
- }
-
-
- private IWorkbenchPage getPage()
- {
- IWorkbench workbench = PlatformUI.getWorkbench();
- IWorkbenchWindow window = workbench.getActiveWorkbenchWindow();
- return window.getActivePage();
- }
-
- /**
- * @param projectFor
- */
- public void setProject(IProject projectFor)
- {
- this._project = projectFor;
- }
-
- /**
- * @param inputName
- * @return the editor id of theditor to open for the inputName or null
- * if none can be ascertained
- */
- public String getEditorID(String inputName)
- {
- IEditorRegistry registry = PlatformUI.getWorkbench().getEditorRegistry();
-
- // check for a default editor
- IEditorDescriptor editorDescriptor = registry.getDefaultEditor(inputName);
-
- // next check the OS for in-place editor (OLE on Win32)
- if (editorDescriptor == null && registry.isSystemInPlaceEditorAvailable(inputName))
- {
- editorDescriptor = registry.findEditor(IEditorRegistry.SYSTEM_INPLACE_EDITOR_ID);
- }
-
- // next check with the OS for an external editor
- if (editorDescriptor == null && registry.isSystemExternalEditorAvailable(inputName))
- {
- editorDescriptor = registry.findEditor(IEditorRegistry.SYSTEM_EXTERNAL_EDITOR_ID);
- }
-
- // next lookup the default text editor
- if (editorDescriptor == null)
- {
- editorDescriptor = registry.findEditor("org.eclipse.ui.DefaultTextEditor"); //$NON-NLS-1$
- }
-
- // if no valid editor found, bail out
- if (editorDescriptor == null)
- {
- return null;
- }
-
- return editorDescriptor.getId();
- }
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.IAction#isEnabled()
- */
- public boolean isEnabled()
- {
- return _project != null && _baseName != null && !"".equals(_baseName);//$NON-NLS-1$
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfcore/LoadBundleElementEdit.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfcore/LoadBundleElementEdit.java
deleted file mode 100644
index 4f3dfe6..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfcore/LoadBundleElementEdit.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.elementedit.jsfcore;
-
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jst.pagedesigner.css2.property.ICSSPropertyID;
-import org.eclipse.jst.pagedesigner.editors.PageDesignerActionConstants;
-import org.eclipse.jst.pagedesigner.elementedit.AbstractElementEdit;
-import org.eclipse.jst.pagedesigner.utils.StructuredModelUtil;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.w3c.dom.Element;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class LoadBundleElementEdit extends AbstractElementEdit
-{
- private LoadBundleAction loadBundleAction;
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.elementedit.IElementEdit#fillContextMenu(org.eclipse.jface.action.IMenuManager, org.w3c.dom.Element)
- */
- public void fillContextMenu(IMenuManager contextMenu, Element ele)
- {
- super.fillContextMenu(contextMenu,ele);
-
- LoadBundleAction action = getAction();
- action.setBaseName(ele.getAttribute(ICSSPropertyID.ATTR_BASENAME));
- if (ele instanceof IDOMElement)
- {
- action.setProject(StructuredModelUtil.getProjectFor(((IDOMElement) ele).getModel()));
- }
- contextMenu.appendToGroup(PageDesignerActionConstants.GROUP_SPECIAL, action);
- }
-
- private LoadBundleAction getAction()
- {
- if (loadBundleAction == null)
- {
- loadBundleAction = new LoadBundleAction();
- }
- return loadBundleAction;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/ColumnElementEdit.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/ColumnElementEdit.java
deleted file mode 100644
index 78affcf..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/ColumnElementEdit.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.elementedit.jsfhtml;
-
-import java.util.Iterator;
-
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.jst.jsf.common.dom.TagIdentifier;
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.editpolicies.ColumnHelper;
-import org.eclipse.jst.pagedesigner.editpolicies.ColumnResizableEditPolicy;
-import org.eclipse.jst.pagedesigner.parts.ElementEditPart;
-import org.eclipse.jst.pagedesigner.parts.NodeEditPart;
-import org.eclipse.jst.pagedesigner.validation.caret.IPositionMediator;
-import org.eclipse.jst.pagedesigner.validation.caret.Target;
-import org.eclipse.jst.pagedesigner.viewer.CaretPositionResolver;
-import org.eclipse.jst.pagedesigner.viewer.DefaultDropLocationStrategy;
-import org.eclipse.jst.pagedesigner.viewer.DesignPosition;
-import org.eclipse.jst.pagedesigner.viewer.IDropLocationStrategy;
-import org.w3c.dom.Element;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class ColumnElementEdit extends DefaultJSFHTMLElementEdit
-{
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.elementedit.AbstractElementEdit#handleModelChange(org.w3c.dom.Element, org.eclipse.jst.pagedesigner.parts.ElementEditPart)
- */
- public boolean handleModelChange(Element ele, ElementEditPart part, boolean recursive)
- {
- EditPart parent = part.getParent();
- if (parent instanceof ElementEditPart)
- {
- ((ElementEditPart) parent).refreshModelChange(recursive);
- return true;
- }
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.elementedit.IElementEdit#createEditPolicies(org.eclipse.jst.pagedesigner.parts.ElementEditPart)
- */
- public void createEditPolicies(ElementEditPart part)
- {
- part.installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new ColumnResizableEditPolicy());
- }
-
- public IDropLocationStrategy getDropRequestorLocationStrategy(TagIdentifier tag, EditPartViewer viewer) {
- return new MyDropLocationStrategy(viewer);
- }
-
- private static class MyDropLocationStrategy extends DefaultDropLocationStrategy
- {
- /**
- * @param viewer
- */
- public MyDropLocationStrategy(EditPartViewer viewer) {
- super(viewer);
- }
-
- public DesignPosition calculateDesignPosition(EditPart target,
- Point p, IPositionMediator validator)
- {
- // get the nearest ancestor part to target that is
- // editable or target if it is editable
- target = validator.getEditableContainer(new Target(target));
-
- // target must be an element part
- if (target instanceof ElementEditPart)
- {
- // can only try to drop a column into a table. If we are
- // targetting a column, then we can see if its table will take it
- TagIdentifier tagId = ((ElementEditPart)target).getTagIdentifier();
-
- if (IJSFConstants.TAG_IDENTIFIER_DATA_TABLE.isSameTagType(tagId))
- {
- // if we're on the table, try to figure out which column we are above
- for (Iterator it = target.getChildren().iterator(); it.hasNext();)
- {
- final NodeEditPart nodeEditPart = (NodeEditPart) it.next();
- TagIdentifier tagId2 = nodeEditPart.getTagIdentifier();
-
- if (IJSFConstants.TAG_IDENTIFIER_COLUMN.isSameTagType(tagId2))
- {
- final Rectangle columnBounds =
- ColumnHelper.getAdjustedColumnBoundingRectangle(nodeEditPart);
- if (columnBounds.contains(p))
- {
- target = nodeEditPart;
- break;
- }
- }
- }
- }
-
- // recalculate the id because it may have changed
- tagId = ((ElementEditPart)target).getTagIdentifier();
-
- if (IJSFConstants.TAG_IDENTIFIER_COLUMN.isSameTagType(tagId))
- {
- DesignPosition position = null;
- final Rectangle columnBounds =
- ColumnHelper.getAdjustedColumnBoundingRectangle((GraphicalEditPart) target);
- if (CaretPositionResolver.toXMiddle(columnBounds, p) < 0)
- {
- position = DesignPosition.createPositionBeforePart(target);
- }
- else
- {
- position = DesignPosition.createPositionAfterPart(target);
- }
-
-
- if (validator.isValidPosition(position))
- {
- return position;
- }
- }
- }
-
- // otherwise, no valid position
- return null;
- }
-
- protected Rectangle createCaretBounds(DesignPosition position) {
- Rectangle bounds = super.createCaretBounds(position);
-
- // we want to extend the insert caret to be the height of the column container (i.e. dataTable)
- // and positioned so it starts at the top of the container in the column where the insertion will occur
- GraphicalEditPart parent =
- (GraphicalEditPart) position.getContainerPart();
- Rectangle containerBounds = parent.getFigure().getBounds().getCopy();
- parent.getFigure().translateToAbsolute(containerBounds);
- bounds.height = containerBounds.height;
- bounds.y = containerBounds.y;
- return bounds;
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/DataTableElementEdit.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/DataTableElementEdit.java
deleted file mode 100644
index ac60adb..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/DataTableElementEdit.java
+++ /dev/null
@@ -1,485 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.elementedit.jsfhtml;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.DragTracker;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.requests.DropRequest;
-import org.eclipse.gef.requests.LocationRequest;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jst.jsf.common.dom.TagIdentifier;
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.actions.single.SelectEditPartAction;
-import org.eclipse.jst.pagedesigner.editors.PageDesignerActionConstants;
-import org.eclipse.jst.pagedesigner.editpolicies.DragMoveEditPolicy;
-import org.eclipse.jst.pagedesigner.editpolicies.ElementResizableEditPolicy;
-import org.eclipse.jst.pagedesigner.jsf.core.dom.JSFDOMUtil;
-import org.eclipse.jst.pagedesigner.jsf.ui.JSFUIPlugin;
-import org.eclipse.jst.pagedesigner.jsf.ui.actions.DeleteHColumnHeaderFooterAction;
-import org.eclipse.jst.pagedesigner.jsf.ui.actions.DeleteHeaderFooterAction;
-import org.eclipse.jst.pagedesigner.jsf.ui.actions.InsertHColumnHeaderFooterAction;
-import org.eclipse.jst.pagedesigner.jsf.ui.actions.InsertHeaderFooterAction;
-import org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml.DataTableDeleteColumnCommand;
-import org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml.DataTableDeleteColumnHeaderCommand;
-import org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml.DataTableDeleteHeaderCommand;
-import org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml.DataTableInsertColumnCommand;
-import org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml.DataTableInsertColumnHeaderCommand;
-import org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml.DataTableInsertHeaderCommand;
-import org.eclipse.jst.pagedesigner.jsf.ui.elementedit.request.DeleteHColumnHeaderFooterRequest;
-import org.eclipse.jst.pagedesigner.jsf.ui.elementedit.request.DeleteHeaderFooterRequest;
-import org.eclipse.jst.pagedesigner.jsf.ui.elementedit.request.InsertHColumnHeaderFooterRequest;
-import org.eclipse.jst.pagedesigner.jsf.ui.elementedit.request.InsertHeaderFooterRequest;
-import org.eclipse.jst.pagedesigner.jsf.ui.elementedit.util.DataTableUtil;
-import org.eclipse.jst.pagedesigner.parts.ElementEditPart;
-import org.eclipse.jst.pagedesigner.parts.NodeEditPart;
-import org.eclipse.jst.pagedesigner.tableedit.DeleteRowColumnAction;
-import org.eclipse.jst.pagedesigner.tableedit.InsertRowColumnAction;
-import org.eclipse.jst.pagedesigner.tableedit.TableInsertRequest;
-import org.eclipse.jst.pagedesigner.tableedit.TableResizeRequest;
-import org.eclipse.jst.pagedesigner.tableedit.TableRowColumnDeleteRequest;
-import org.eclipse.jst.pagedesigner.tools.ObjectModeDragTracker;
-import org.eclipse.jst.pagedesigner.validation.caret.ActionData;
-import org.eclipse.jst.pagedesigner.validation.caret.DefaultPositionRule;
-import org.eclipse.jst.pagedesigner.validation.caret.DnDPositionValidator;
-import org.eclipse.jst.pagedesigner.validation.caret.DropActionData;
-import org.eclipse.jst.pagedesigner.validation.caret.IPositionMediator;
-import org.eclipse.jst.pagedesigner.validation.caret.Target;
-import org.eclipse.jst.pagedesigner.validation.caret.DropActionData.DropData;
-import org.eclipse.jst.pagedesigner.viewer.IHTMLGraphicalViewer;
-import org.eclipse.swt.graphics.Cursor;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class DataTableElementEdit extends DefaultJSFHTMLElementEdit
-{
- private final static Action EMPTY_ACTION = new Action()
- {
- // TODO: why?
- };
- private final static int FAKE_INDEX = -10;
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.elementedit.IElementEdit#fillContextMenu(org.eclipse.jface.action.IMenuManager, org.w3c.dom.Element)
- */
- public void fillContextMenu(IMenuManager contextMenu, Element ele)
- {
- super.fillContextMenu(contextMenu, ele);
-
- final IMenuManager tableMenu = new MenuManager(JSFUIPlugin.getResourceString("ElementEdit.Submenu.DataTable"));//$NON-NLS-1$
- final ElementEditPart editPart = (ElementEditPart) ((IDOMElement) ele).getAdapterFor(EditPart.class);
- // ok, we passed the checking, now let's create the actions.
- tableMenu.add(EMPTY_ACTION);
- tableMenu.addMenuListener(new IMenuListener()
- {
- public void menuAboutToShow(IMenuManager manager)
- {
- tableMenu.removeAll();
- fillTableMenu(editPart, FAKE_INDEX, tableMenu);
- }
- });
-
- contextMenu.appendToGroup(PageDesignerActionConstants.GROUP_CONTAINER, tableMenu);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.elementedit.IElementEdit#fillContainerContextMenu(org.eclipse.jface.action.IMenuManager, org.eclipse.jst.pagedesigner.parts.ElementEditPart, org.eclipse.jst.pagedesigner.parts.NodeEditPart, org.eclipse.jface.viewers.ISelection)
- */
- public boolean fillContainerContextMenu(IMenuManager contextMenu, final ElementEditPart elePart,
- NodeEditPart nodePart, ISelection innerSelection)
- {
- Element table = (Element) elePart.getModel();
- Node node = (Node) nodePart.getModel();
-
- DataTableUtil util = new DataTableUtil(table);
- Element columnParent = util.findHColumnParent(node);
-
- final int cellColumn = util.getColumnIndex(columnParent);
-
- final IMenuManager tableMenu = new MenuManager(JSFUIPlugin.getResourceString("ElementEdit.Submenu.DataTable"));//$NON-NLS-1$
-
- // ok, we passed the checking, now let's create the actions.
- tableMenu.add(EMPTY_ACTION);
- tableMenu.addMenuListener(new IMenuListener()
- {
- public void menuAboutToShow(IMenuManager manager)
- {
- tableMenu.removeAll();
- fillTableMenu(elePart, cellColumn, tableMenu);
- }
- });
-
- contextMenu.appendToGroup(PageDesignerActionConstants.GROUP_CONTAINER, tableMenu);
- return true;
-
- }
-
- /**
- * @param elePart
- * @param cellColumn
- * @param tableMenu
- */
- private void fillTableMenu(ElementEditPart elePart, int cellColumn, IMenuManager tableMenu)
- {
- SelectEditPartAction action = SelectEditPartAction.create(JSFUIPlugin
- .getResourceString("ElementEdit.Submenu.DataTable.SelectTable"), elePart);//$NON-NLS-1$
- tableMenu.add(action);
-
- tableMenu.add(new Separator());
-
- {
- InsertRowColumnAction insertColumnBeforeAction = new InsertRowColumnAction(JSFUIPlugin
- .getResourceString("ElementEdit.Submenu.DataTable.InsertColumnBefore"), //$NON-NLS-1$
- elePart, cellColumn, false, true);
- tableMenu.add(insertColumnBeforeAction);
-
- InsertRowColumnAction insertColumnAfterAction = new InsertRowColumnAction(JSFUIPlugin
- .getResourceString("ElementEdit.Submenu.DataTable.InsertColumnAfter"),//$NON-NLS-1$
- elePart, cellColumn, false, false);
- tableMenu.add(insertColumnAfterAction);
-
- tableMenu.add(new Separator());
- }
-
- {
- DeleteRowColumnAction deleteColumnAction = new DeleteRowColumnAction(JSFUIPlugin
- .getResourceString("ElementEdit.Submenu.DataTable.DeleteColumn"), //$NON-NLS-1$
- elePart, cellColumn, false);
- tableMenu.add(deleteColumnAction);
- tableMenu.add(new Separator());
- }
-
- {
- InsertHeaderFooterAction headerAction = new InsertHeaderFooterAction(JSFUIPlugin
- .getResourceString("ElementEdit.Submenu.InsertTableHeader"), elePart, true);//$NON-NLS-1$
- tableMenu.add(headerAction);
-
- InsertHeaderFooterAction footerAction = new InsertHeaderFooterAction(JSFUIPlugin
- .getResourceString("ElementEdit.Submenu.InsertTableFooter"), elePart, false);//$NON-NLS-1$
- tableMenu.add(footerAction);
-
- DeleteHeaderFooterAction delHeaderAction = new DeleteHeaderFooterAction(JSFUIPlugin
- .getResourceString("ElementEdit.Submenu.DeleteTableHeader"), elePart, true);//$NON-NLS-1$
- tableMenu.add(delHeaderAction);
-
- DeleteHeaderFooterAction delFooterAction = new DeleteHeaderFooterAction(JSFUIPlugin
- .getResourceString("ElementEdit.Submenu.DeleteTableFooter"), elePart, false);//$NON-NLS-1$
- tableMenu.add(delFooterAction);
- tableMenu.add(new Separator());
- }
-
- {
- InsertHColumnHeaderFooterAction hColHeaderAction = new InsertHColumnHeaderFooterAction(JSFUIPlugin
- .getResourceString("ElementEdit.Submenu.InsertColumnHeader"),//$NON-NLS-1$
- elePart, true);
- tableMenu.add(hColHeaderAction);
-
- InsertHColumnHeaderFooterAction hColFooterAction = new InsertHColumnHeaderFooterAction(JSFUIPlugin
- .getResourceString("ElementEdit.Submenu.InsertColumnFooter"),//$NON-NLS-1$
- elePart, false);
- tableMenu.add(hColFooterAction);
-
- DeleteHColumnHeaderFooterAction delColHeader = new DeleteHColumnHeaderFooterAction(JSFUIPlugin
- .getResourceString("ElementEdit.Submenu.DeleteColumnHeader"),//$NON-NLS-1$
- elePart, true);
- tableMenu.add(delColHeader);
-
- DeleteHColumnHeaderFooterAction delColFooter = new DeleteHColumnHeaderFooterAction(JSFUIPlugin
- .getResourceString("ElementEdit.Submenu.DeleteColumnFooter"),//$NON-NLS-1$
- elePart, false);
- tableMenu.add(delColFooter);
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.elementedit.IElementEdit#createEditPolicies(org.eclipse.jst.pagedesigner.parts.ElementEditPart)
- */
- public void createEditPolicies(ElementEditPart part)
- {
- part.installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new DataTableResizePolicy(part));
- part.installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,
- new MyDragMoveEditPolicy());
- }
-
- static class DataTableResizePolicy extends ElementResizableEditPolicy
- {
- ElementEditPart _part;
- Cursor _columnSelectCursor;
-
- /**
- * @param part
- */
- public DataTableResizePolicy(ElementEditPart part)
- {
- _part = part;
- }
-
- public void deactivate() {
- super.deactivate();
- if (_columnSelectCursor != null && !_columnSelectCursor.isDisposed())
- {
- _columnSelectCursor.dispose();
- _columnSelectCursor = null;
- }
- }
-
- private Cursor getColumnSelectCursor()
- {
- if (_columnSelectCursor == null)
- {
- final Image cursorImage = JSFUIPlugin.getDefault().getImage("column_select.gif");
- _columnSelectCursor = new Cursor(null, cursorImage.getImageData(), 2, 5);
- }
-
- return _columnSelectCursor;
- }
- /* (non-Javadoc)
- * @see org.eclipse.gef.editpolicies.ResizableEditPolicy#getCommand(org.eclipse.gef.Request)
- */
- public Command getCommand(Request request)
- {
- IHTMLGraphicalViewer viewer = (IHTMLGraphicalViewer) _part.getViewer();
- Element dataTable = (Element) _part.getIDOMNode();
- if (request instanceof TableResizeRequest)
- {
- return super.getCommand(request);
- }
- else if (request instanceof TableInsertRequest)
- {
- TableInsertRequest tableInsertRequest = (TableInsertRequest) request;
- if (tableInsertRequest.isRow())
- {
- // don't support insert row.
- return null;
- }
- int index = tableInsertRequest.getIndex() + (tableInsertRequest.isBefore() ? 0 : 1);
- return new DataTableInsertColumnCommand(viewer, dataTable, index);
- }
- else if (request instanceof InsertHeaderFooterRequest)
- {
- InsertHeaderFooterRequest req = (InsertHeaderFooterRequest) request;
- boolean isHeader = req.isHeader();
- return new DataTableInsertHeaderCommand(viewer, dataTable, isHeader);
- }
- else if (request instanceof DeleteHeaderFooterRequest)
- {
- DeleteHeaderFooterRequest req = (DeleteHeaderFooterRequest) request;
- boolean isHeader = req.isHeader();
- return new DataTableDeleteHeaderCommand(viewer, dataTable, isHeader);
- }
- else if (request instanceof InsertHColumnHeaderFooterRequest)
- {
- InsertHColumnHeaderFooterRequest req = (InsertHColumnHeaderFooterRequest) request;
- boolean isHeader = req.isHeader();
- return new DataTableInsertColumnHeaderCommand(viewer, dataTable, isHeader);
- }
- else if (request instanceof DeleteHColumnHeaderFooterRequest)
- {
- DeleteHColumnHeaderFooterRequest req = (DeleteHColumnHeaderFooterRequest) request;
- boolean isHeader = req.isHeader();
- return new DataTableDeleteColumnHeaderCommand(viewer, dataTable, isHeader);
- }
- else if (request instanceof TableRowColumnDeleteRequest)
- {
- TableRowColumnDeleteRequest deleteReq = (TableRowColumnDeleteRequest) request;
- if (deleteReq.isRow())
- {
- return null;
- }
- return new DataTableDeleteColumnCommand(viewer, dataTable, deleteReq.getIndex());
- }
- return super.getCommand(request);
- }
-
- public Cursor getSelectionToolCursor(Point mouseLocation)
- {
- if (hitTestColumnSelection(mouseLocation))
- {
- return getColumnSelectCursor();
- }
-
- return null;
- }
-
- protected DragTracker getSelectionTracker(LocationRequest request) {
- final Point mouseLocator = request.getLocation();
- if (hitTestColumnSelection(mouseLocator))
- {
- ObjectModeDragTracker dragTracker = new ObjectModeDragTracker(getHost())
- {
- protected boolean handleButtonDown(int button)
- {
- // only customize the case where we are in a column selection mode
- if (button == 1)
- {
- EditPart retarget =
- getRetargetSelectionEditPart(mouseLocator);
-
- if (retarget != null)
- {
- setSourceEditPart(retarget);
- }
- }
-
- // default
- return super.handleButtonDown(button);
- }
- };
-
- dragTracker.setDefaultCursor(getSelectionToolCursor(mouseLocator));
- return dragTracker;
- }
- return new ObjectModeDragTracker(getHost());
- }
-
- public DragTracker getSelectionDragTracker(LocationRequest request) {
- return getSelectionTracker(request);
- }
-
- /**
- * @param mouseLocation
- * @return the edit part fo the given mouse location
- */
- public EditPart getRetargetSelectionEditPart(Point mouseLocation) {
- if (hitTestColumnSelection(mouseLocation))
- {
- GraphicalEditPart editPart = (GraphicalEditPart) getHost();
- List children = editPart.getChildren();
-
- for (Iterator it = children.iterator(); it.hasNext();)
- {
- GraphicalEditPart child = (GraphicalEditPart) it.next();
-
- if (child instanceof NodeEditPart)
- {
- Node childNode = ((NodeEditPart)child).getDOMNode();
-
- if (JSFDOMUtil.isHColumn(childNode))
- {
- Point relativeMousePointer = mouseLocation.getCopy();
- IFigure hostFigure = child.getFigure();
- hostFigure.translateToRelative(relativeMousePointer);
- Rectangle hostBounds = hostFigure.getBounds();
- if (relativeMousePointer.x >= hostBounds.x
- && relativeMousePointer.x < hostBounds.x+hostBounds.width)
- {
- return child;
- }
- }
- }
- }
- }
-
- // otherwise, don't retarget
- return null;
- }
-
- private boolean hitTestColumnSelection(Point mouseLocation)
- {
- final GraphicalEditPart part = (GraphicalEditPart) getHost();
- final IFigure panelFigure = part.getFigure();
-
- Point relativeLocation = mouseLocation.getCopy();
- panelFigure.translateToRelative(relativeLocation);
-
- final int yoffsetAbs = Math.abs(panelFigure.getBounds().y - relativeLocation.y);
-
- if (yoffsetAbs <= 4)
- {
- return true;
- }
-
- return false;
- }
- }
-
- /**
- * @author cbateman
- *
- */
- public static class MyDragMoveEditPolicy extends DragMoveEditPolicy
- {
- protected IPositionMediator createDropChildValidator(
- DropRequest r)
- {
- DropData dropData = createDropData(r);
-
- if (dropData!=null)
- {
- DnDPositionValidator validator =
- new DnDPositionValidator(new DropActionData(
- ActionData.COMPONENT_MOVE, dropData));
- validator.addRule(new OnlyColumnsAndFacetsRule(validator.getActionData()));
- return validator;
- }
- return null;
- }
-
- private static class OnlyColumnsAndFacetsRule extends DefaultPositionRule
- {
- /**
- * @param actionData
- */
- public OnlyColumnsAndFacetsRule(ActionData actionData) {
- super(actionData);
- }
-
- public boolean isEditable(Target target) {
- if (IJSFConstants.TAG_IDENTIFIER_DATA_TABLE.isSameTagType(target.getTagWrapper()))
- {
- return isDataDroppable();
- }
-
- return true;
- }
-
- private boolean isDataDroppable()
- {
- ActionData actionData = getActionData();
- if (actionData instanceof DropActionData)
- {
- DropActionData dropActionData = (DropActionData) actionData;
- TagIdentifier tagId =
- (TagIdentifier) dropActionData.getDropData().getTagIdentifiers().get(0);
-
- if (IJSFConstants.TAG_IDENTIFIER_FACET.isSameTagType(tagId)
- || IJSFConstants.TAG_IDENTIFIER_COLUMN.isSameTagType(tagId))
- {
- return true;
- }
- }
-
- return false;
- }
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/DefaultJSFHTMLElementEdit.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/DefaultJSFHTMLElementEdit.java
deleted file mode 100644
index 2bfcd06..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/DefaultJSFHTMLElementEdit.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.elementedit.jsfhtml;
-
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jst.pagedesigner.elementedit.AbstractElementEdit;
-import org.eclipse.jst.pagedesigner.jsf.ui.actions.IJSFCoreSupport;
-import org.eclipse.jst.pagedesigner.jsf.ui.actions.JSFAddActionGroup;
-import org.eclipse.jst.pagedesigner.jsf.ui.actions.JSFNavigationGroup;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.w3c.dom.Element;
-
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class DefaultJSFHTMLElementEdit extends AbstractElementEdit
-{
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.elementedit.AbstractElementEdit#fillContextMenu(org.eclipse.jface.action.IMenuManager, org.w3c.dom.Element)
- */
- public void fillContextMenu(IMenuManager contextMenu, Element ele)
- {
- super.fillContextMenu(contextMenu, ele);
-
- // next are JSF HTML special support.
- new JSFAddActionGroup().fillContextMenu(contextMenu, (IDOMElement) ele, new JSFCoreSupport(ele.getLocalName()));
- new JSFNavigationGroup().fillContextMenu(contextMenu, (IDOMElement) ele, new JSFCoreSupport(ele.getLocalName()));
- }
-
- static class JSFCoreSupport implements IJSFCoreSupport
- {
- String _localName;
-
- /**
- * @param localtag
- */
- public JSFCoreSupport(String localtag)
- {
- _localName = localtag;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.jsf.actions.IJSFCoreSupport#isActionSource()
- */
- public boolean isActionSource()
- {
- // UICommand.
- return _localName.startsWith("command");
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.jsf.actions.IJSFCoreSupport#isUIComponent()
- */
- public boolean isUIComponent()
- {
- return true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.jsf.actions.IJSFCoreSupport#isValueHolder()
- */
- public boolean isValueHolder()
- {
- // UIOutput
- return _localName.startsWith("output") || _localName.startsWith("input")
- || _localName.startsWith("select");
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.jsf.actions.IJSFCoreSupport#isEditableValueHolder()
- */
- public boolean isEditableValueHolder()
- {
- // UIInput
- return _localName.startsWith("input") || _localName.startsWith("select");
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.jsf.actions.IJSFCoreSupport#supportSelectItems()
- */
- public boolean supportSelectItems()
- {
- return _localName.startsWith("select");
- }
-
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/JSFHTMLElementEditFactory.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/JSFHTMLElementEditFactory.java
deleted file mode 100644
index ebae8db..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/JSFHTMLElementEditFactory.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.elementedit.jsfhtml;
-
-import org.eclipse.jst.jsf.common.dom.TagIdentifier;
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.elementedit.IElementEdit;
-import org.eclipse.jst.pagedesigner.elementedit.IElementEditFactory;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class JSFHTMLElementEditFactory implements IElementEditFactory
-{
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.elementedit.IElementEditFactory#createElementEdit(org.w3c.dom.Element)
- */
- public IElementEdit createElementEdit(final TagIdentifier tagIdentifier)
- {
- if (IJSFConstants.TAG_IDENTIFIER_DATA_TABLE.isSameTagType(tagIdentifier))
- {
- return new DataTableElementEdit();
- }
- else if (IJSFConstants.TAG_IDENTIFIER_PANEL_GRID.isSameTagType(tagIdentifier))
- {
- return new PanelGridElementEdit();
- }
- else if (IJSFConstants.TAG_IDENTIFIER_COLUMN.isSameTagType(tagIdentifier))
- {
- return new ColumnElementEdit();
- }
- return new DefaultJSFHTMLElementEdit();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.elementedit.IElementEditFactory#getSupportedURI()
- */
- public String getSupportedURI()
- {
- return ITLDConstants.URI_JSF_HTML;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/PanelGridElementEdit.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/PanelGridElementEdit.java
deleted file mode 100644
index 6719607..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/PanelGridElementEdit.java
+++ /dev/null
@@ -1,322 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.elementedit.jsfhtml;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.SharedCursors;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.actions.single.SelectEditPartAction;
-import org.eclipse.jst.pagedesigner.editors.PageDesignerActionConstants;
-import org.eclipse.jst.pagedesigner.editpolicies.ElementResizableEditPolicy;
-import org.eclipse.jst.pagedesigner.jsf.ui.JSFUIPlugin;
-import org.eclipse.jst.pagedesigner.jsf.ui.actions.DeleteHeaderFooterAction;
-import org.eclipse.jst.pagedesigner.jsf.ui.actions.InsertHeaderFooterAction;
-import org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml.DataTableDeleteHeaderCommand;
-import org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml.PanelGridDeleteColumnCommand;
-import org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml.PanelGridDeleteRowCommand;
-import org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml.PanelGridInsertColumnCommand;
-import org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml.PanelGridInsertFooterCommand;
-import org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml.PanelGridInsertHeaderCommand;
-import org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml.PanelGridInsertRowCommand;
-import org.eclipse.jst.pagedesigner.jsf.ui.elementedit.request.DeleteHeaderFooterRequest;
-import org.eclipse.jst.pagedesigner.jsf.ui.elementedit.request.InsertHeaderFooterRequest;
-import org.eclipse.jst.pagedesigner.jsf.ui.elementedit.util.PanelGridUtil;
-import org.eclipse.jst.pagedesigner.parts.ElementEditPart;
-import org.eclipse.jst.pagedesigner.parts.NodeEditPart;
-import org.eclipse.jst.pagedesigner.tableedit.DeleteRowColumnAction;
-import org.eclipse.jst.pagedesigner.tableedit.InsertRowColumnAction;
-import org.eclipse.jst.pagedesigner.tableedit.TableInsertRequest;
-import org.eclipse.jst.pagedesigner.tableedit.TableResizeRequest;
-import org.eclipse.jst.pagedesigner.tableedit.TableRowColumnDeleteRequest;
-import org.eclipse.jst.pagedesigner.viewer.IHTMLGraphicalViewer;
-import org.eclipse.swt.graphics.Cursor;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class PanelGridElementEdit extends DefaultJSFHTMLElementEdit
-{
- private final static Action EMPTY_ACTION = new Action()
- {
- // TODO: why?
- };
- private final static int FAKE_INDEX = -10;
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.elementedit.IElementEdit#fillContextMenu(org.eclipse.jface.action.IMenuManager, org.w3c.dom.Element)
- */
- public void fillContextMenu(IMenuManager contextMenu, Element ele)
- {
- super.fillContextMenu(contextMenu, ele);
-
- final IMenuManager tableMenu = new MenuManager(JSFUIPlugin.getResourceString("ElementEdit.Submenu.PanelGrid"));//$NON-NLS-1$
- tableMenu.add(EMPTY_ACTION);
- final ElementEditPart gridEditPart = (ElementEditPart) ((IDOMElement) ele).getAdapterFor(EditPart.class);
-
- // ok, we passed the checking, now let's create the actions.
- tableMenu.addMenuListener(new IMenuListener()
- {
- public void menuAboutToShow(IMenuManager manager)
- {
- tableMenu.removeAll();
- fillPanelGridMenu(gridEditPart, FAKE_INDEX, FAKE_INDEX, tableMenu);
- }
- });
-
- contextMenu.appendToGroup(PageDesignerActionConstants.GROUP_CONTAINER, tableMenu);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.elementedit.IElementEdit#fillContainerContextMenu(org.eclipse.jface.action.IMenuManager, org.eclipse.jst.pagedesigner.parts.ElementEditPart, org.eclipse.jst.pagedesigner.parts.NodeEditPart, org.eclipse.jface.viewers.ISelection)
- */
- public boolean fillContainerContextMenu(IMenuManager contextMenu, final ElementEditPart elePart,
- NodeEditPart nodePart, ISelection innerSelection)
- {
- Element table = (Element) elePart.getModel();
- Node node = (Node) nodePart.getModel();
-
- Element childEle = null;
- if (node instanceof Element)
- {
- childEle = (Element) node;
- }
- else
- {
- boolean hasElementParent = false;
- Node nodeBackup = node;
- while (!IJSFConstants.TAG_PANELGRID.equalsIgnoreCase(nodeBackup.getParentNode().getLocalName()))
- {
- nodeBackup = nodeBackup.getParentNode();
- if (nodeBackup instanceof Element)
- {
- hasElementParent = true;
- break;
- }
- }
- if (!hasElementParent)
- {
- return false;
- }
- childEle = (Element) nodeBackup;
- }
-
- PanelGridUtil util = new PanelGridUtil(table);
- final int cellRow = util.convertRowIndexFromDomToView(util.getDomRowIndex(childEle));
- final int cellColumn = util.getDomColumnIndex(childEle);
-
- final IMenuManager tableMenu = new MenuManager(JSFUIPlugin.getResourceString("ElementEdit.Submenu.PanelGrid"));//$NON-NLS-1$
- tableMenu.add(EMPTY_ACTION);
-
- // ok, we passed the checking, now let's create the actions.
- tableMenu.addMenuListener(new IMenuListener()
- {
- public void menuAboutToShow(IMenuManager manager)
- {
- tableMenu.removeAll();
- fillPanelGridMenu(elePart, cellRow, cellColumn, tableMenu);
- }
- });
-
- contextMenu.appendToGroup(PageDesignerActionConstants.GROUP_CONTAINER, tableMenu);
- return true;
-
- }
-
- /**
- * @param elePart
- * @param cellRow
- * @param cellColumn
- * @param tableMenu
- */
- private void fillPanelGridMenu(ElementEditPart elePart, int cellRow, int cellColumn, IMenuManager tableMenu)
- {
- SelectEditPartAction action = SelectEditPartAction.create(JSFUIPlugin
- .getResourceString("ElementEdit.Submenu.PanelGrid.SelectTable"), elePart);//$NON-NLS-1$
- tableMenu.add(action);
-
- tableMenu.add(new Separator());
-
- {
- InsertRowColumnAction insertRowBeforeAction = new InsertRowColumnAction(JSFUIPlugin
- .getResourceString("ElementEdit.Submenu.PanelGrid.InsertRowBefore"), //$NON-NLS-1$
- elePart, cellRow, true, true);
- tableMenu.add(insertRowBeforeAction);
-
- InsertRowColumnAction insertRowAfterAction = new InsertRowColumnAction(JSFUIPlugin
- .getResourceString("ElementEdit.Submenu.PanelGrid.InsertRowAfter"), //$NON-NLS-1$
- elePart, cellRow, true, false);
- tableMenu.add(insertRowAfterAction);
-
- tableMenu.add(new Separator());
- }
-
- {
- InsertRowColumnAction insertColumnBeforeAction = new InsertRowColumnAction(JSFUIPlugin
- .getResourceString("ElementEdit.Submenu.PanelGrid.InsertColumnBefore"), //$NON-NLS-1$
- elePart, cellColumn, false, true);
- tableMenu.add(insertColumnBeforeAction);
-
- InsertRowColumnAction insertColumnAfterAction = new InsertRowColumnAction(JSFUIPlugin
- .getResourceString("ElementEdit.Submenu.PanelGrid.InsertColumnAfter"), //$NON-NLS-1$
- elePart, cellColumn, false, false);
- tableMenu.add(insertColumnAfterAction);
-
- tableMenu.add(new Separator());
- }
-
- {
- DeleteRowColumnAction deleteRowAction = new DeleteRowColumnAction(JSFUIPlugin
- .getResourceString("ElementEdit.Submenu.PanelGrid.DeleteRow"), //$NON-NLS-1$
- elePart, cellRow, true);
- tableMenu.add(deleteRowAction);
-
- DeleteRowColumnAction deleteColumnAction = new DeleteRowColumnAction(JSFUIPlugin
- .getResourceString("ElementEdit.Submenu.PanelGrid.DeleteColumn"), //$NON-NLS-1$
- elePart, cellColumn, false);
- tableMenu.add(deleteColumnAction);
- tableMenu.add(new Separator());
- }
-
- {
- InsertHeaderFooterAction headerAction = new InsertHeaderFooterAction(JSFUIPlugin
- .getResourceString("ElementEdit.Submenu.PanelGrid.InsertHeader"), //$NON-NLS-1$
- elePart, true);
- tableMenu.add(headerAction);
-
- InsertHeaderFooterAction footerAction = new InsertHeaderFooterAction(JSFUIPlugin
- .getResourceString("ElementEdit.Submenu.PanelGrid.InsertFooter"), //$NON-NLS-1$
- elePart, false);
- tableMenu.add(footerAction);
-
- DeleteHeaderFooterAction delHeaderAction = new DeleteHeaderFooterAction(JSFUIPlugin
- .getResourceString("ElementEdit.Submenu.PanelGird.DeleteHeader"), elePart, true);//$NON-NLS-1$
- tableMenu.add(delHeaderAction);
-
- DeleteHeaderFooterAction delFooterAction = new DeleteHeaderFooterAction(JSFUIPlugin
- .getResourceString("ElementEdit.Submenu.PanelGrid.DeleteFooter"), elePart, false);//$NON-NLS-1$
- tableMenu.add(delFooterAction);
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.elementedit.IElementEdit#createEditPolicies(org.eclipse.jst.pagedesigner.parts.ElementEditPart)
- */
- public void createEditPolicies(ElementEditPart part)
- {
- part.installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new PanelGridResizePolicy(part));
- }
-
- static class PanelGridResizePolicy extends ElementResizableEditPolicy
- {
- ElementEditPart _part;
-
- /**
- * @param part
- */
- public PanelGridResizePolicy(ElementEditPart part)
- {
- _part = part;
- }
-
- public Cursor getSelectionToolCursor(Point mouseLocation)
- {
- final GraphicalEditPart part = (GraphicalEditPart) getHost();
- final IFigure panelFigure = part.getFigure();
-
- Point relativeLocation = mouseLocation.getCopy();
- panelFigure.translateToRelative(relativeLocation);
-
- // row cursor if we are within +/- 2 pixels of the left side
- final int xoffsetAbs = Math.abs(panelFigure.getBounds().x - relativeLocation.x);
-
- if (xoffsetAbs <= 2)
- {
- return SharedCursors.SIZEE;
- }
-
- final int yoffsetAbs = Math.abs(panelFigure.getBounds().y - relativeLocation.y);
-
- if (yoffsetAbs <= 2)
- {
- return SharedCursors.SIZEW;
- }
-
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.gef.editpolicies.ResizableEditPolicy#getCommand(org.eclipse.gef.Request)
- */
- public Command getCommand(Request request)
- {
- IHTMLGraphicalViewer viewer = (IHTMLGraphicalViewer) _part.getViewer();
- Element panelGrid = (Element) _part.getIDOMNode();
- if (request instanceof TableResizeRequest)
- {
- return super.getCommand(request);
- }
- else if (request instanceof TableInsertRequest)
- {
- TableInsertRequest tableInsertRequest = (TableInsertRequest) request;
- if (tableInsertRequest.isRow())
- {
- int index = tableInsertRequest.getIndex() + (tableInsertRequest.isBefore() ? 0 : 1);
- return new PanelGridInsertRowCommand(viewer, panelGrid, index);
- }
- int index = tableInsertRequest.getIndex() + (tableInsertRequest.isBefore() ? 0 : 1);
- return new PanelGridInsertColumnCommand(viewer, panelGrid, index);
- }
- else if (request instanceof InsertHeaderFooterRequest)
- {
- InsertHeaderFooterRequest req = (InsertHeaderFooterRequest) request;
- boolean isHeader = req.isHeader();
- if (isHeader)
- {
- return new PanelGridInsertHeaderCommand(viewer, panelGrid);
- }
- return new PanelGridInsertFooterCommand(viewer, panelGrid);
- }
- else if (request instanceof DeleteHeaderFooterRequest)
- {
- DeleteHeaderFooterRequest req = (DeleteHeaderFooterRequest) request;
- boolean isHeader = req.isHeader();
- return new DataTableDeleteHeaderCommand(viewer, panelGrid, isHeader);
- }
- else if (request instanceof TableRowColumnDeleteRequest)
- {
- TableRowColumnDeleteRequest deleteReq = (TableRowColumnDeleteRequest) request;
- if (deleteReq.isRow())
- {
- return new PanelGridDeleteRowCommand(viewer, panelGrid, deleteReq.getIndex());
- }
- return new PanelGridDeleteColumnCommand(viewer, panelGrid, deleteReq.getIndex());
- }
- return super.getCommand(request);
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/request/DeleteHColumnHeaderFooterRequest.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/request/DeleteHColumnHeaderFooterRequest.java
deleted file mode 100644
index 076fd74..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/request/DeleteHColumnHeaderFooterRequest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.elementedit.request;
-
-import org.eclipse.gef.Request;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class DeleteHColumnHeaderFooterRequest extends Request
-{
- private boolean _isHeader;
-
- /**
- * @param type
- * @param isHeader
- */
- public DeleteHColumnHeaderFooterRequest(String type, boolean isHeader)
- {
- super(type);
- this._isHeader = isHeader;
- }
-
- /**
- * @return Returns the _isHeader.
- */
- public boolean isHeader()
- {
- return _isHeader;
- }
-
- /**
- * @param header The _isHeader to set.
- */
- public void setHeader(boolean header)
- {
- _isHeader = header;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/request/DeleteHeaderFooterRequest.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/request/DeleteHeaderFooterRequest.java
deleted file mode 100644
index d935652..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/request/DeleteHeaderFooterRequest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.elementedit.request;
-
-import org.eclipse.gef.Request;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class DeleteHeaderFooterRequest extends Request
-{
- private boolean _isHeader;
-
- /**
- * @param type
- * @param isHeader
- */
- public DeleteHeaderFooterRequest(String type, boolean isHeader)
- {
- super(type);
- this._isHeader = isHeader;
- }
-
- /**
- * @return Returns the _isHeader.
- */
- public boolean isHeader()
- {
- return _isHeader;
- }
-
- /**
- * @param header The _isHeader to set.
- */
- public void setHeader(boolean header)
- {
- _isHeader = header;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/request/InsertHColumnHeaderFooterRequest.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/request/InsertHColumnHeaderFooterRequest.java
deleted file mode 100644
index 34e3d4a..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/request/InsertHColumnHeaderFooterRequest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.elementedit.request;
-
-import org.eclipse.gef.Request;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class InsertHColumnHeaderFooterRequest extends Request
-{
- private boolean _isHeader;
-
- /**
- * @param type
- * @param isHeader
- */
- public InsertHColumnHeaderFooterRequest(String type, boolean isHeader)
- {
- super(type);
- this._isHeader = isHeader;
- }
-
- /**
- * @return Returns the _isHeader.
- */
- public boolean isHeader()
- {
- return _isHeader;
- }
-
- /**
- * @param header The _isHeader to set.
- */
- public void setHeader(boolean header)
- {
- _isHeader = header;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/request/InsertHeaderFooterRequest.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/request/InsertHeaderFooterRequest.java
deleted file mode 100644
index 31e853f..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/request/InsertHeaderFooterRequest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.elementedit.request;
-
-import org.eclipse.gef.Request;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class InsertHeaderFooterRequest extends Request
-{
- private boolean _isHeader;
-
- /**
- * @param type
- * @param isHeader
- */
- public InsertHeaderFooterRequest(String type, boolean isHeader)
- {
- super(type);
- this._isHeader = isHeader;
- }
-
- /**
- * @return Returns the _isHeader.
- */
- public boolean isHeader()
- {
- return _isHeader;
- }
-
- /**
- * @param header The _isHeader to set.
- */
- public void setHeader(boolean header)
- {
- _isHeader = header;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/util/DataTableUtil.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/util/DataTableUtil.java
deleted file mode 100644
index a6f3602..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/util/DataTableUtil.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.elementedit.util;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.jsf.core.dom.JSFDOMUtil;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class DataTableUtil
-{
- private static final int INVALID_POSITION = -10;
- private Element _dataTable = null;
-
- /**
- * @param dataTable
- */
- public DataTableUtil(Element dataTable)
- {
- this._dataTable = dataTable;
- }
-
- /**
- * @param column
- * @return the column index for column
- */
- public int getColumnIndex(Element column)
- {
- NodeList nodeList = this._dataTable.getElementsByTagName("h:column");
- if (nodeList != null)
- {
- for (int i = 0, size = nodeList.getLength(); i < size; i++)
- {
- if (column == (Element) nodeList.item(i))
- {
- return i;
- }
- }
- }
- return INVALID_POSITION;
- }
-
- /**
- * @param child
- * @return the hcolumn parent of child or null if not found
- */
- public Element findHColumnParent(Node child)
- {
- if (child == null)
- {
- return null;
- }
-
- Node childBackup = child;
- boolean hasHColumnParent = false;
-
- if (JSFDOMUtil.isHColumn(child))
- {
- return (Element) child;
- }
- while (!IJSFConstants.TAG_DATATABLE.equalsIgnoreCase(childBackup.getParentNode().getLocalName()))
- {
- childBackup = childBackup.getParentNode();
- String tagName = childBackup.getLocalName();
- if (IJSFConstants.TAG_COLUMN.equalsIgnoreCase(tagName))
- {
- hasHColumnParent = true;
- break;
- }
- }
-
- if (hasHColumnParent)
- {
- return (Element) childBackup;
- }
- return null;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/util/PanelGridUtil.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/util/PanelGridUtil.java
deleted file mode 100644
index bc57d28..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/util/PanelGridUtil.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.elementedit.util;
-
-import java.util.List;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.jsf.core.dom.JSFDOMUtil;
-import org.w3c.dom.Element;
-
-import org.eclipse.jst.pagedesigner.utils.DOMUtil;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class PanelGridUtil
-{
- private static final int INVALID_POSITION = -10;
- private Element _panelGrid = null;
-
- /**
- * @param panelGrid
- */
- public PanelGridUtil(Element panelGrid)
- {
- this._panelGrid = panelGrid;
- }
-
- /**
- * @param domIndex
- * @return the row index in the panel of the relative dom index
- */
- public int convertRowIndexFromDomToView(int domIndex)
- {
- boolean hasHeaderRow = (JSFDOMUtil.findFacet(this._panelGrid, "header") != null);
- boolean hasFooterRow = (JSFDOMUtil.findFacet(this._panelGrid, "footer") != null);
- if (!hasFooterRow)
- {
- return domIndex;
- }
- if (domIndex == 0)
- {
- return domIndex;
- }
- if (hasHeaderRow)
- {
- if (domIndex > 1)
- {
- return domIndex - 1;
- }
- }
- else
- {
- if (domIndex > 0)
- {
- return domIndex - 1;
- }
- }
- //must be footer
- int uiRows = getUIRowCount();
- return domIndex + uiRows;
- }
-
- /**
- * @param cell
- * @return the dom row index of cell in the panel
- */
- public int getDomRowIndex(Element cell)
- {
- boolean hasHeaderRow = (JSFDOMUtil.findFacet(this._panelGrid, "header") != null);
- boolean hasFooterRow = (JSFDOMUtil.findFacet(this._panelGrid, "footer") != null);
- //if cell is header or footer
- boolean isFacet = JSFDOMUtil.isFacet(cell);
- Element parent = (Element) cell.getParentNode();
- boolean isParentFacet = JSFDOMUtil.isFacet(parent);
- if (isParentFacet)
- {
- cell = parent;
- }
- if (isFacet || isParentFacet)
- {
- String attrName = cell.getAttribute("name");
- if ("header".equalsIgnoreCase(attrName))
- {
- return 0;
- }
- else if ("footer".equalsIgnoreCase(attrName))
- {
- if (hasHeaderRow)
- {
- return 1;
- }
- return 0;
- }
- }
-
- int columns = DOMUtil.getIntAttributeIgnoreCase(this._panelGrid, IJSFConstants.ATTR_COLUMNS, 1);
- if (columns < 1)
- {
- columns = 1;
- }
- int pos = getPosition(cell);
- int rowIndex = pos / columns;
-
- if (hasHeaderRow)
- {
- rowIndex++;
- }
- if (hasFooterRow)
- {
- rowIndex++;
- }
-
- return rowIndex;
- }
-
- /**
- * @param cell
- * @return the column index of cell in the panel
- */
- public int getDomColumnIndex(Element cell)
- {
- int columns = DOMUtil.getIntAttributeIgnoreCase(this._panelGrid, IJSFConstants.ATTR_COLUMNS, 1);
- if (columns < 1)
- {
- columns = 1;
- }
- int pos = getPosition(cell);
- //if position is at header or footer,then insert column action should be disabled
- if (pos == INVALID_POSITION)
- {
- return pos;
- }
-
- int columnIndex = pos % columns;
- return columnIndex;
- }
-
- /**
- * @return the row count in the panel
- */
- public int getUIRowCount()
- {
- int columns = DOMUtil.getIntAttributeIgnoreCase(this._panelGrid, IJSFConstants.ATTR_COLUMNS, 1);
- if (columns < 1)
- {
- columns = 1;
- }
- List children = JSFDOMUtil.getUIComponentChildren(this._panelGrid);
- int numRows = (children.size() + columns - 1) / columns;
-
- return numRows;
- }
-
- private int getPosition(Element cell)
- {
- List children = JSFDOMUtil.getUIComponentChildren(this._panelGrid);
- int size = children.size();
- int i = 0;
- for (i = 0; i < size; i++)
- {
- if (cell == children.get(i))
- {
- break;
- }
- }
- if (i == size)
- {
- return INVALID_POSITION;
- }
- return i;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/IInputWidgetTypes.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/IInputWidgetTypes.java
deleted file mode 100644
index a2df68a..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/IInputWidgetTypes.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 Oracle 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:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.sections;
-
-interface IInputWidgetTypes
-{
- /**
- * a hidden input
- */
- public static final int HIDDEN = 0;
- /**
- * a secret input
- */
- public static final int SECRET = 1;
- /**
- * an input box
- */
- public static final int TEXT = 2;
- /**
- * an input text area
- */
- public static final int TEXTAREA = 3;
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFCoreConvertDateTimeGroup.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFCoreConvertDateTimeGroup.java
deleted file mode 100644
index af64865..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFCoreConvertDateTimeGroup.java
+++ /dev/null
@@ -1,281 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.sections;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.IDialogFieldApplyListener;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.StyleComboDialogField;
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.commands.single.ChangeAttributeCommand;
-import org.eclipse.jst.pagedesigner.editors.properties.IPropertyPageDescriptor;
-import org.eclipse.jst.pagedesigner.meta.EditorCreator;
-import org.eclipse.jst.pagedesigner.properties.internal.AttributeGroup;
-import org.eclipse.jst.pagedesigner.ui.dialogfields.DialogFieldWrapper;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-
-/**
- * This group could be used in both section and dialog.
- *
- * @author mengbo
- * @version 1.5
- */
-public class JSFCoreConvertDateTimeGroup extends AttributeGroup//AttributeGroup
-{
- private StyleComboDialogField _typeField;
- private StyleComboDialogField _dateStyleField;
- private StyleComboDialogField _timeStyleField;
- private StyleComboDialogField _patternField;
-
- final private static String[] TYPES = { "date", "time", "both" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- };
- final private static String[] DATESTYLES = { "default", "short", "medium", "long", "full", "custom" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
- };
- final private static String[] TIMESTYLES = { "default", "short", "medium", "long", "full", "custom" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
- };
- final private static String[] DATEPATTERNS = { "", "M/d/yy", "EEE, M/d/yy", "MM/dd/yyyy", "EEE, MM/dd/yyyy", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
- "MMM d, yyyy", "EEE, MMM d, yyyy", "MMMM d, yyyy", "EEEE, MMMM d, yyyy", "MMMM yyyy" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
- };
- final private static String[] TIMEPATTERNS = { "", "hh:mm", "hh:mm z", "HH:mm z", "HH:mm:ss z" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
- };
- final private static String[] DATETIMEPATTERNS = {
- "", "M/d/yy hh:mm", "EEE, M/d/yy hh:mm", "MM/dd/yyyy HH:mm:ss z", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- "EEE, MM/dd/yyyy HH:mm:ss z", "MMM d, yyyy HH:mm z", "EEE, MMM d, yyyy HH:mm z", "MMMM d, yyyy HH:mm z", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- "EEEE, MMMM d, yyyy HH:mm z" //$NON-NLS-1$
- };
-
- /**
- * The default constructor
- */
- public JSFCoreConvertDateTimeGroup()
- {
- super(ITLDConstants.URI_JSF_CORE, IJSFConstants.TAG_CONVERTDATETIME, new String[] { IJSFConstants.ATTR_TYPE,
- IJSFConstants.ATTR_DATESTYLE, IJSFConstants.ATTR_TIMESTYLE, IJSFConstants.ATTR_PATTERN});
- }
-
- protected DialogField createDialogField(IPropertyPageDescriptor ppd) {
- EditorCreator creator = EditorCreator.getInstance();
- if (ppd.getAttributeName().equals(IJSFConstants.ATTR_TYPE))
- {
- DialogFieldWrapper wrapper = (DialogFieldWrapper) creator
- .createDialogFieldWithWrapper(getURI(), getTagName(), ppd, null);
- _typeField = (StyleComboDialogField) wrapper.getWrappedDialogField();
- return wrapper;
- }
- else if (ppd.getAttributeName().equals(IJSFConstants.ATTR_DATESTYLE))
- {
- DialogFieldWrapper wrapper = (DialogFieldWrapper) creator
- .createDialogFieldWithWrapper(getURI(), getTagName(), ppd, null);
- _dateStyleField = (StyleComboDialogField) wrapper.getWrappedDialogField();
- _dateStyleField.setItems(DATESTYLES);
- return wrapper;
- }
- else if (ppd.getAttributeName().equals(IJSFConstants.ATTR_TIMESTYLE))
- {
- DialogFieldWrapper wrapper = (DialogFieldWrapper) creator
- .createDialogFieldWithWrapper(getURI(), getTagName(), ppd, null);
- _timeStyleField = (StyleComboDialogField) wrapper.getWrappedDialogField();
- _timeStyleField.setItems(TIMESTYLES);
- return wrapper;
- }
- else if (ppd.getAttributeName().equals(IJSFConstants.ATTR_PATTERN))
- {
- DialogFieldWrapper wrapper = (DialogFieldWrapper) creator
- .createDialogFieldWithWrapper(getURI(), getTagName(), ppd, null);
- _patternField = (StyleComboDialogField) wrapper.getWrappedDialogField();
- return wrapper;
- }
- else
- {
- return null;
- }
- }
-
- protected IDialogFieldApplyListener getDialogFieldApplyListener(IPropertyPageDescriptor ppd)
- {
- String attribute = ppd.getAttributeName();
- if (attribute.equals(IJSFConstants.ATTR_TYPE) || attribute.equals(IJSFConstants.ATTR_DATESTYLE)
- || attribute.equals(IJSFConstants.ATTR_TIMESTYLE))
- {
- IDialogFieldApplyListener listener = new IDialogFieldApplyListener()
- {
- public void dialogFieldApplied(DialogField field)
- {
- updatePatternItems();
- updateFieldStatus();
- updateFieldData();
- }
- };
- return listener;
- }
- else if (attribute.equals(IJSFConstants.ATTR_PATTERN))
- {
- IDialogFieldApplyListener listener = new IDialogFieldApplyListener()
- {
- public void dialogFieldApplied(DialogField field)
- {
- updateFieldStatus();
- updateFieldData();
- }
- };
- return listener;
- }
- else
- {
- return null;
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.properties.attrgroup.AttributeGroup#refreshData()
- */
-
- public void refreshData()
- {
- IDOMElement element = getElement();
-
- String type = element.getAttribute(IJSFConstants.ATTR_TYPE);
- _typeField.setTextWithoutUpdate(type);
-
- String dateStyle = element.getAttribute(IJSFConstants.ATTR_DATESTYLE);
- if (!_dateStyleField.getText().equalsIgnoreCase(DATESTYLES[5]))
- {
- _dateStyleField.setTextWithoutUpdate(dateStyle);
- }
-
- String timeStyle = element.getAttribute(IJSFConstants.ATTR_TIMESTYLE);
- if (!_timeStyleField.getText().equalsIgnoreCase(TIMESTYLES[5]))
- {
- _timeStyleField.setTextWithoutUpdate(timeStyle);
- }
-
- updatePatternItems();
- String pattern = element.getAttribute(IJSFConstants.ATTR_PATTERN);
- _patternField.setTextWithoutUpdate(pattern);
-
- updateFieldStatus();
- }
-
- /**
- *
- */
- private void updateFieldStatus()
- {
- String type = _typeField.getText();
- String dateStyle = _dateStyleField.getText();
- String timeStyle = _timeStyleField.getText();
-
- if (type.equalsIgnoreCase(TYPES[0]))
- {
- _dateStyleField.setEnabled(true);
- _timeStyleField.setEnabled(false);
- if (dateStyle.equalsIgnoreCase(DATESTYLES[5]))
- {
- _patternField.setEnabled(true);
- }
- else
- {
- _patternField.setEnabled(false);
- }
- }
- else if (type.equalsIgnoreCase(TYPES[1]))
- {
- _dateStyleField.setEnabled(false);
- _timeStyleField.setEnabled(true);
- if (timeStyle.equalsIgnoreCase(TIMESTYLES[5]))
- {
- _patternField.setEnabled(true);
- }
- else
- {
- _patternField.setEnabled(false);
- }
- }
- else if (type.equalsIgnoreCase(TYPES[2]))
- {
- _dateStyleField.setEnabled(true);
- _timeStyleField.setEnabled(true);
- if (dateStyle.equalsIgnoreCase(DATESTYLES[5]) || timeStyle.equalsIgnoreCase(TIMESTYLES[5]))
- {
- _patternField.setEnabled(true);
- }
- else
- {
- _patternField.setEnabled(false);
- }
- }
- }
-
- private void updatePatternItems()
- {
- String type = _typeField.getText();
- String dateStyle = _dateStyleField.getText();
- String timeStyle = _timeStyleField.getText();
-
- if (type.equalsIgnoreCase(TYPES[0]) && dateStyle.equalsIgnoreCase(DATESTYLES[5]))
- {
- _patternField.getComboControl(null, null).removeAll();
- _patternField.getComboControl(null, null).setItems(DATEPATTERNS);
- }
-
- if (type.equalsIgnoreCase(TYPES[1]) && timeStyle.equalsIgnoreCase(TIMESTYLES[5]))
- {
- _patternField.getComboControl(null, null).removeAll();
- _patternField.getComboControl(null, null).setItems(TIMEPATTERNS);
- }
-
- if (type.equalsIgnoreCase(TYPES[2])
- && (dateStyle.equalsIgnoreCase(DATESTYLES[5]) || timeStyle.equalsIgnoreCase(TIMESTYLES[5])))
- {
- _patternField.getComboControl(null, null).removeAll();
- _patternField.getComboControl(null, null).setItems(DATETIMEPATTERNS);
- }
- }
-
- private void updateFieldData()
- {
- String type = _typeField.getText();
- String dateStyle = _dateStyleField.getText();
- String timeStyle = _timeStyleField.getText();
- String pattern = _patternField.getText();
-
- // update the model
- if (!_dateStyleField.isEnabled() || dateStyle.equalsIgnoreCase(DATESTYLES[5]))
- {
- dateStyle = "";
- }
-
- if (!_timeStyleField.isEnabled() || timeStyle.equalsIgnoreCase(TIMESTYLES[5]))
- {
- timeStyle = "";
- }
-
- if (!_patternField.isEnabled())
- {
- pattern = "";
-
- }
-
- Map map = new HashMap();
- map.put(IJSFConstants.ATTR_TYPE, type);
- map.put(IJSFConstants.ATTR_DATESTYLE, dateStyle);
- map.put(IJSFConstants.ATTR_TIMESTYLE, timeStyle);
- map.put(IJSFConstants.ATTR_PATTERN, pattern);
-
- ChangeAttributeCommand c = new ChangeAttributeCommand(SectionResources
- .getString("JSFCoreConvertDateTimeSection.ChangeAttribute"), getElement(), map);
- c.execute();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFCoreConvertNumberGroup.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFCoreConvertNumberGroup.java
deleted file mode 100644
index 3765751..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFCoreConvertNumberGroup.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.sections;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.IDialogFieldApplyListener;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.StringDialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.StyleComboDialogField;
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.commands.single.ChangeAttributeCommand;
-import org.eclipse.jst.pagedesigner.editors.properties.IPropertyPageDescriptor;
-import org.eclipse.jst.pagedesigner.meta.EditorCreator;
-import org.eclipse.jst.pagedesigner.properties.internal.AttributeGroup;
-import org.eclipse.jst.pagedesigner.ui.dialogfields.DialogFieldWrapper;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-
-/**
- * @author mengbo
- */
-public class JSFCoreConvertNumberGroup extends AttributeGroup
-{
- private StyleComboDialogField _typeField;
- private StyleComboDialogField _patternField;
- private StyleComboDialogField _currencyCodeField;
- private StringDialogField _currencySymbolField;
-
- final private static String[] TYPES = { "number", "currency", "percentage", "custom" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- };
-
- /**
- * The default constructor
- */
- public JSFCoreConvertNumberGroup()
- {
- super(ITLDConstants.URI_JSF_CORE, IJSFConstants.TAG_CONVERTNUMBER, new String[] { IJSFConstants.ATTR_TYPE,
- IJSFConstants.ATTR_CURRENCYCODE, IJSFConstants.ATTR_CURRENCYSYMBOL, IJSFConstants.ATTR_PATTERN});
- }
-
- protected DialogField createDialogField(IPropertyPageDescriptor ppd)
- {
- EditorCreator creator = EditorCreator.getInstance();
- if (ppd.getAttributeName().equals(IJSFConstants.ATTR_TYPE))
- {
- DialogFieldWrapper wrapper = (DialogFieldWrapper) creator
- .createDialogFieldWithWrapper(getURI(), getTagName(), ppd, null);
- _typeField = (StyleComboDialogField) wrapper.getWrappedDialogField();
- _typeField.setItems(TYPES);
- return wrapper;
- }
- else if (ppd.getAttributeName().equals(IJSFConstants.ATTR_CURRENCYCODE))
- {
- DialogFieldWrapper wrapper = (DialogFieldWrapper) creator
- .createDialogFieldWithWrapper(getURI(), getTagName(), ppd, null);
- _currencyCodeField = (StyleComboDialogField) wrapper.getWrappedDialogField();
- return wrapper;
- }
- else if (ppd.getAttributeName().equals(IJSFConstants.ATTR_CURRENCYSYMBOL))
- {
- DialogFieldWrapper wrapper = (DialogFieldWrapper) creator
- .createDialogFieldWithWrapper(getURI(), getTagName(), ppd, null);
- _currencySymbolField = (StringDialogField) wrapper.getWrappedDialogField();
- return wrapper;
- }
- else if (ppd.getAttributeName().equals(IJSFConstants.ATTR_PATTERN))
- {
- DialogFieldWrapper wrapper = (DialogFieldWrapper) creator
- .createDialogFieldWithWrapper(getURI(), getTagName(), ppd, null);
- _patternField = (StyleComboDialogField) wrapper.getWrappedDialogField();
- return wrapper;
- }
- else
- {
- return null;
- }
- }
-
- public IDialogFieldApplyListener getDialogFieldApplyListener(IPropertyPageDescriptor ppd)
- {
- String attribute = ppd.getAttributeName();
- if (attribute.equals(IJSFConstants.ATTR_CURRENCYCODE) || attribute.equals(IJSFConstants.ATTR_CURRENCYSYMBOL)
- || attribute.equals(IJSFConstants.ATTR_PATTERN))
- {
- IDialogFieldApplyListener listener = new IDialogFieldApplyListener()
- {
- public void dialogFieldApplied(DialogField field)
- {
- updateFieldData();
- }
- };
- return listener;
- }
- else if (attribute.equals(IJSFConstants.ATTR_TYPE))
- {
- IDialogFieldApplyListener listener = new IDialogFieldApplyListener()
- {
- public void dialogFieldApplied(DialogField field)
- {
- updateFieldStatus();
- updateFieldData();
- }
- };
- return listener;
- }
- else
- {
- return null;
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.pagedesigner.properties.attrgroup.AttributeGroup#refreshData()
- */
- public void refreshData()
- {
- IDOMElement element = getElement();
-
- String type = element.getAttribute(IJSFConstants.ATTR_TYPE);
- if (!_typeField.getText().equalsIgnoreCase(TYPES[3]))
- {
- _typeField.setTextWithoutUpdate(type);
- }
-
- String currencyCode = element.getAttribute(IJSFConstants.ATTR_CURRENCYCODE);
- _currencyCodeField.setTextWithoutUpdate(currencyCode);
-
- String currencySymbol = element.getAttribute(IJSFConstants.ATTR_CURRENCYSYMBOL);
- _currencySymbolField.setTextWithoutUpdate(currencySymbol);
-
- String pattern = element.getAttribute(IJSFConstants.ATTR_PATTERN);
- _patternField.setTextWithoutUpdate(pattern);
-
- updateFieldStatus();
- }
-
- private void updateFieldStatus()
- {
- String type = _typeField.getText();
-
- if (type.equalsIgnoreCase(TYPES[0]))
- {
- _currencyCodeField.setEnabled(false);
- _currencySymbolField.setEnabled(false);
- _patternField.setEnabled(false);
- }
- else if (type.equalsIgnoreCase(TYPES[1]))
- {
- _currencyCodeField.setEnabled(true);
- _currencySymbolField.setEnabled(true);
- _patternField.setEnabled(false);
- }
- else if (type.equalsIgnoreCase(TYPES[2]))
- {
- _currencyCodeField.setEnabled(false);
- _currencySymbolField.setEnabled(false);
- _patternField.setEnabled(false);
- }
- else if (type.equalsIgnoreCase(TYPES[3]))
- {
- _currencyCodeField.setEnabled(false);
- _currencySymbolField.setEnabled(false);
- _patternField.setEnabled(true);
- }
- }
-
- private void updateFieldData()
- {
- String type = _typeField.getText();
- String currencyCode = _currencyCodeField.getText();
- String currencySymbol = _currencySymbolField.getText();
- String pattern = _patternField.getText();
-
- // update the model
- if (type.equalsIgnoreCase(TYPES[3]))
- {
- type = "";
- }
-
- if (!_currencyCodeField.isEnabled())
- {
- currencyCode = "";
- }
-
- if (!_currencySymbolField.isEnabled())
- {
- currencySymbol = "";
- }
-
- if (!_patternField.isEnabled())
- {
- pattern = "";
- }
-
- Map map = new HashMap();
- map.put(IJSFConstants.ATTR_TYPE, type);
- map.put(IJSFConstants.ATTR_CURRENCYCODE, currencyCode);
- map.put(IJSFConstants.ATTR_CURRENCYSYMBOL, currencySymbol);
- map.put(IJSFConstants.ATTR_PATTERN, pattern);
-
- ChangeAttributeCommand c = new ChangeAttributeCommand(SectionResources
- .getString("JSFCoreConvertNumberSection.CommandLabel.ChangeAttribute"), getElement(), map);
- c.execute();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlActionListenerSection.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlActionListenerSection.java
deleted file mode 100644
index 3e3626c..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlActionListenerSection.java
+++ /dev/null
@@ -1,326 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.sections;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelection;
-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.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.commands.single.AddSubNodeCommand;
-import org.eclipse.jst.pagedesigner.commands.single.RemoveSubNodeCommand;
-import org.eclipse.jst.pagedesigner.properties.BaseCustomSection;
-import org.eclipse.jst.pagedesigner.properties.DesignerPropertyTool;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-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.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class JSFHtmlActionListenerSection extends BaseCustomSection
-{
- final private static String[] LISTENTYPES = { "Action"};
-
- private IDOMElement _element;
- private Table _listenersTable;
- private TableViewer _listenersViewer;
- private CCombo _listenTypeCombo;
- private Button _listenAddButton, _listenRemoveButton;
-
- private class ListenerContentLabelProvider implements IStructuredContentProvider, ITableLabelProvider
- {
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
- */
- public Object[] getElements(Object inputElement)
- {
- IDOMElement root = _element;
- List result = new ArrayList();
-
- NodeList children = root.getChildNodes();
- for (int i = 0, n = children.getLength(); i < n; i++)
- {
- Node child = children.item(i);
- if (child.getNodeType() == Node.ELEMENT_NODE)
- {
- IDOMElement element = (IDOMElement) child;
- String nodeName = element.getNodeName();
- if (nodeName.indexOf("Listener") != -1) //$NON-NLS-1$
- {
- result.add(child);
- }
- }
- }
-
- if (result.isEmpty())
- {
- return new Object[0];
- }
-
- return result.toArray(new IDOMElement[result.size()]);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
- */
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
- {
- // no support for viewer changes
- }
-
- public String getColumnText(Object element, int columnIndex)
- {
- String result = null;
- if (element instanceof Node)
- {
- Node node = (Node) element;
- String nodeName = getTableNodeName(node, "type");
- switch (columnIndex)
- {
- case 0:
- result = nodeName;
- break;
- default:
- break;
- }
- }
- return result != null ? result : ""; //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IContentProvider#dispose()
- */
-
- private String getTableNodeName(Node node, String ... attrNames) {
- for (String attrName : attrNames) {
- Node attr = node.getAttributes().getNamedItem(attrName);
- if (attr != null && attr.getNodeValue()!= null &&
- ! attr.getNodeValue().trim().equals(""))
- return attr.getNodeValue().trim();
- }
- return node.getNodeName();
- }
-
- public void dispose()
- {
- // nothing to dispose
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
- */
- public Image getColumnImage(Object element, int columnIndex)
- {
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- public void addListener(ILabelProviderListener listener)
- {
- // TODO: listeners not supported?
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)
- */
- public boolean isLabelProperty(Object element, String property)
- {
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- public void removeListener(ILabelProviderListener listener)
- {
- // TODO: listeners not supported?
- }
- }
-
- /**
- * Default constructor
- */
- public JSFHtmlActionListenerSection()
- {
- super();
- }
-
- public void createControls(Composite parent, TabbedPropertySheetPage aTabbedPropertySheetPage)
- {
- super.createControls(parent, aTabbedPropertySheetPage);
- TabbedPropertySheetWidgetFactory factory = aTabbedPropertySheetPage.getWidgetFactory();
- Composite top = factory.createFlatFormComposite(parent);
-
- GridLayout layout = new GridLayout();
- layout.numColumns = 4;
- top.setLayout(layout);
-
- createListenerPart(factory, top);
- }
-
- /**
- * @param factory
- * @param other
- */
- private void createListenerPart(TabbedPropertySheetWidgetFactory factory, Composite other)
- {
- GridData data;
- _listenersTable = factory.createTable(other, SWT.FULL_SELECTION | SWT.MULTI);
- data = new GridData(GridData.FILL_BOTH);
- data.horizontalSpan = 3;
- data.verticalSpan = 4;
- data.heightHint = 50;
- data.widthHint = 100;
- _listenersTable.setHeaderVisible(true);
- _listenersTable.setLayoutData(data);
- _listenersTable.setLinesVisible(true);
-
- TableColumn listenColumn = new TableColumn(_listenersTable, SWT.NONE);
- listenColumn.setText(SectionResources.getString("JSFHtmlCommandButtonSection.Listeners")); //$NON-NLS-1$
- listenColumn.setWidth(500);
-
- _listenersViewer = new TableViewer(_listenersTable);
- _listenersViewer.setContentProvider(new ListenerContentLabelProvider());
- _listenersViewer.setLabelProvider(new ListenerContentLabelProvider());
- _listenersViewer.addDoubleClickListener(new IDoubleClickListener()
- {
- public void doubleClick(DoubleClickEvent event)
- {
- IStructuredSelection selection = (IStructuredSelection) event.getSelection();
- if (selection != null)
- {
- IDOMElement node = (IDOMElement) selection.getFirstElement();
- gotoNode(node);
- }
- }
- });
- _listenersViewer.addSelectionChangedListener(new ISelectionChangedListener()
- {
- public void selectionChanged(SelectionChangedEvent event)
- {
- updateListenerButtonStatus();
- }
- });
-
- _listenTypeCombo = factory.createCCombo(other, SWT.READ_ONLY);
- _listenTypeCombo.setItems(LISTENTYPES);
- _listenTypeCombo.select(0);
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- _listenTypeCombo.setLayoutData(data);
-
- _listenAddButton = factory.createButton(other, SectionResources.getString("JSFHtmlCommandButtonSection.Add"), //$NON-NLS-1$
- SWT.NONE);
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- _listenAddButton.setLayoutData(data);
- _listenAddButton.addSelectionListener(new SelectionAdapter()
- {
- public void widgetSelected(SelectionEvent e)
- {
- Map attributes = new HashMap();
- String listener = _listenTypeCombo.getText();
- listener = listener.substring(0, 1).toLowerCase() + listener.substring(1) + "Listener"; //$NON-NLS-1$
- AddSubNodeCommand c = new AddSubNodeCommand(
- SectionResources.getString("JSFHtmlCommandButtonSection.CommandLabel.AddSubTag"), _element, listener, ITLDConstants.URI_JSF_CORE, attributes); //$NON-NLS-1$
- c.execute();
- _listenersViewer.refresh();
- updateListenerButtonStatus();
- }
- });
- _listenRemoveButton = factory.createButton(other, SectionResources
- .getString("JSFHtmlCommandButtonSection.Remove"), SWT.NONE); //$NON-NLS-1$
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- _listenRemoveButton.setLayoutData(data);
- _listenRemoveButton.addSelectionListener(new SelectionAdapter()
- {
- public void widgetSelected(SelectionEvent e)
- {
- IStructuredSelection selection = (IStructuredSelection) _listenersViewer.getSelection();
- if (selection != null)
- {
- for (Iterator i = selection.iterator(); i.hasNext();)
- {
- IDOMElement node = (IDOMElement) i.next();
- RemoveSubNodeCommand c = new RemoveSubNodeCommand(SectionResources
- .getString("JSFHtmlCommandButtonSection.CommandLabel.RemoveSubTag"), _element, node); //$NON-NLS-1$
- c.execute();
- }
- _listenersViewer.refresh();
- updateListenerButtonStatus();
- }
- }
- });
- }
-
- private void updateListenerButtonStatus()
- {
- _listenRemoveButton.setEnabled(true);
- ISelection selection = _listenersViewer.getSelection();
- if (selection == null || selection.isEmpty())
- {
- _listenRemoveButton.setEnabled(false);
- }
- if (_listenersTable.getItemCount() == 0)
- {
- _listenRemoveButton.setEnabled(false);
- }
- }
-
- public void setInput(IWorkbenchPart part, ISelection selection)
- {
- super.setInput(part, selection);
- _element = (IDOMElement) DesignerPropertyTool.getElement(part, selection);
- if (_listenersViewer != null)
- _listenersViewer.setInput(_element);
- }
-
- protected void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos)
- {
- if(_listenersViewer != null && !_listenersViewer.getControl().isDisposed())
- {
- _listenersViewer.refresh();
- }
-
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlDataTableColumnsSection.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlDataTableColumnsSection.java
deleted file mode 100644
index 92bd788..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlDataTableColumnsSection.java
+++ /dev/null
@@ -1,390 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.sections;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelection;
-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.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.commands.single.AddSubNodeCommand;
-import org.eclipse.jst.pagedesigner.commands.single.InsertSubNodeCommand;
-import org.eclipse.jst.pagedesigner.commands.single.RemoveSubNodeCommand;
-import org.eclipse.jst.pagedesigner.properties.BaseCustomSection;
-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.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class JSFHtmlDataTableColumnsSection extends BaseCustomSection
-{
- private Table _columnsTable;
- private TableViewer _columnsViewer;
- private Button _addButton, _removeButton, _moveUpButton, _moveDownButton;
-
- final static private String DEFAULT_COLUMN_NAME = "column"; //$NON-NLS-1$
- final static private String DEFAULT_FACET_NAME = "header"; //$NON-NLS-1$
- final static private String DEFAULT_TEXT_NAME = "text"; //$NON-NLS-1$
-
- class ColumnCotentLabelProvider implements IStructuredContentProvider, ITableLabelProvider
- {
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
- */
- public Object[] getElements(Object inputElement)
- {
- IDOMElement root = _element;
- List result = new ArrayList();
-
- NodeList children = root.getChildNodes();
- for (int i = 0, n = children.getLength(); i < n; i++)
- {
- Node child = children.item(i);
- if (child.getNodeType() == Node.ELEMENT_NODE)
- {
- IDOMElement element = (IDOMElement) child;
- String nodeName = element.getNodeName();
- if (nodeName.indexOf("column") != -1) //$NON-NLS-1$
- {
- result.add(child);
- }
- }
- }
-
- if (result.isEmpty())
- {
- return new Object[0];
- }
-
- return result.toArray(new IDOMElement[result.size()]);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
- */
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
- {
- // no support for input changed
- }
-
- public String getColumnText(Object element, int columnIndex)
- {
- String result = null;
- if (element instanceof IDOMElement)
- {
- IDOMElement node = (IDOMElement) element;
- switch (columnIndex)
- {
- case 0:
- result = node.getAttribute(IJSFConstants.ATTR_ID);
- break;
- default:
- break;
- }
- }
- return result != null ? result : ""; //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IContentProvider#dispose()
- */
-
- public void dispose()
- {
- // nothing to dispose
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
- */
- public Image getColumnImage(Object element, int columnIndex)
- {
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- public void addListener(ILabelProviderListener listener)
- {
- // TODO: no support for listeners?
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)
- */
- public boolean isLabelProperty(Object element, String property)
- {
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- public void removeListener(ILabelProviderListener listener)
- {
- // TODO: no support for listeners?
- }
-
- }
-
- /**
- * default constructor
- */
- public JSFHtmlDataTableColumnsSection()
- {
- super();
- }
-
- public void createControls(Composite parent, TabbedPropertySheetPage aTabbedPropertySheetPage)
- {
- super.createControls(parent, aTabbedPropertySheetPage);
- TabbedPropertySheetWidgetFactory factory = aTabbedPropertySheetPage.getWidgetFactory();
- Composite top = factory.createFlatFormComposite(parent);
-
- GridLayout layout = new GridLayout();
- layout.numColumns = 4;
- top.setLayout(layout);
-
- createColumnPart(factory, top);
- }
-
- private void createColumnPart(TabbedPropertySheetWidgetFactory factory, Composite other)
- {
- GridData data;
- _columnsTable = factory.createTable(other, SWT.FULL_SELECTION | SWT.MULTI);
- data = new GridData(GridData.FILL_BOTH);
- data.horizontalSpan = 3;
- data.verticalSpan = 4;
- data.widthHint = 10;
- data.heightHint = 50;
- _columnsTable.setHeaderVisible(true);
- _columnsTable.setLayoutData(data);
- _columnsTable.setLinesVisible(true);
-
- TableColumn column = new TableColumn(_columnsTable, SWT.NONE);
- column.setText(SectionResources.getString("JSFHtmlDataTableSection.Columns")); //$NON-NLS-1$
- column.setWidth(200);
-
- _columnsViewer = new TableViewer(_columnsTable);
- _columnsViewer.setContentProvider(new ColumnCotentLabelProvider());
- _columnsViewer.setLabelProvider(new ColumnCotentLabelProvider());
- _columnsViewer.addDoubleClickListener(new IDoubleClickListener()
- {
- public void doubleClick(DoubleClickEvent event)
- {
- IStructuredSelection selection = (IStructuredSelection) event.getSelection();
- if (selection != null)
- {
- IDOMElement node = (IDOMElement) selection.getFirstElement();
- gotoNode(node);
- }
- }
- }
- );
- _columnsViewer.addSelectionChangedListener(new ISelectionChangedListener()
- {
- public void selectionChanged(SelectionChangedEvent event)
- {
- updateButtonStatus();
- }
- }
- );
-
- // add buttons group
- _addButton = factory.createButton(other, SectionResources.getString("JSFHtmlDataTableSection.Add"), SWT.NONE); //$NON-NLS-1$
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- _addButton.setLayoutData(data);
- _addButton.addSelectionListener(new SelectionAdapter()
- {
- public void widgetSelected(SelectionEvent e)
- {
- int count = _columnsTable.getItemCount();
-
- Map attributes = new HashMap();
- attributes.put(IJSFConstants.ATTR_ID, DEFAULT_COLUMN_NAME + (count + 1));
- AddSubNodeCommand c = new AddSubNodeCommand(SectionResources.getString("JSFHtmlDataTableSection.CommandLabel.AddSubTag"), _element, "column", //$NON-NLS-1$ //$NON-NLS-2$
- ITLDConstants.URI_JSF_HTML, attributes);
- c.execute();
-
- IDOMElement child = c.getChildNode();
- attributes = new HashMap();
- attributes.put(IJSFConstants.ATTR_NAME, DEFAULT_FACET_NAME);
- c = new AddSubNodeCommand(SectionResources.getString("JSFHtmlDataTableSection.CommandLabel.AddSubTag"), child, "facet", ITLDConstants.URI_JSF_CORE, attributes); //$NON-NLS-1$ //$NON-NLS-2$
- c.execute();
-
- child = c.getChildNode();
- attributes = new HashMap();
- attributes.put(IJSFConstants.ATTR_ID, DEFAULT_TEXT_NAME + (count + 1));
- attributes.put(IJSFConstants.ATTR_VALUE, DEFAULT_COLUMN_NAME + (count + 1));
- c = new AddSubNodeCommand(SectionResources.getString("JSFHtmlDataTableSection.CommandLabel.AddSubTag"), child, "outputText", ITLDConstants.URI_JSF_HTML, attributes); //$NON-NLS-1$ //$NON-NLS-2$
- c.execute();
-
- _columnsViewer.refresh();
- // if (c.getChildNode() != null)
- // {
- // gotoNode(c.getChildNode());
- // }
- updateButtonStatus();
- }
- }
- );
- _removeButton = factory.createButton(other, SectionResources.getString("JSFHtmlDataTableSection.Remove"), //$NON-NLS-1$
- SWT.NONE);
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- _removeButton.setLayoutData(data);
- _removeButton.addSelectionListener(new SelectionAdapter()
- {
- public void widgetSelected(SelectionEvent e)
- {
- IStructuredSelection selection = (IStructuredSelection) _columnsViewer.getSelection();
- if (selection != null)
- {
- for (Iterator i = selection.iterator(); i.hasNext();)
- {
- IDOMElement node = (IDOMElement) i.next();
- RemoveSubNodeCommand c = new RemoveSubNodeCommand(SectionResources.getString("JSFHtmlDataTableSection.CommandLabel.RemoveSubTag"), _element, node); //$NON-NLS-1$
- c.execute();
- }
- _columnsViewer.refresh();
- updateButtonStatus();
- }
- }
- }
- );
- _moveUpButton = factory.createButton(other, SectionResources.getString("JSFHtmlDataTableSection.MoveUp"), //$NON-NLS-1$
- SWT.NONE);
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- _moveUpButton.setLayoutData(data);
- _moveUpButton.addSelectionListener(new SelectionAdapter()
- {
- public void widgetSelected(SelectionEvent e)
- {
- int index = _columnsTable.getSelectionIndex();
- IDOMElement child = (IDOMElement) _columnsTable.getItem(index).getData();
- IDOMElement refchild = (IDOMElement) _columnsTable.getItem(index - 1).getData();
- RemoveSubNodeCommand remove = new RemoveSubNodeCommand(SectionResources.getString("JSFHtmlDataTableSection.CommandLabel.RemoveSubTag"), _element, child); //$NON-NLS-1$
- remove.execute();
- InsertSubNodeCommand insert = new InsertSubNodeCommand(SectionResources.getString("JSFHtmlDataTableSection.CommandLabel.InsertSubTag"), _element, child, refchild); //$NON-NLS-1$
- insert.execute();
- _columnsViewer.refresh();
- updateButtonStatus();
- }
- }
- );
- _moveDownButton = factory.createButton(other, SectionResources.getString("JSFHtmlDataTableSection.MoveDown"), //$NON-NLS-1$
- SWT.NONE);
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- _moveDownButton.setLayoutData(data);
- _moveDownButton.addSelectionListener(new SelectionAdapter()
- {
- public void widgetSelected(SelectionEvent e)
- {
- int index = _columnsTable.getSelectionIndex();
- IDOMElement child = (IDOMElement) _columnsTable.getItem(index).getData();
- IDOMElement refchild = (IDOMElement) _columnsTable.getItem(index + 1).getData();
- RemoveSubNodeCommand remove = new RemoveSubNodeCommand(SectionResources.getString("JSFHtmlDataTableSection.CommandLabel.RemoveSubTag"), _element, refchild); //$NON-NLS-1$
- remove.execute();
- InsertSubNodeCommand insert = new InsertSubNodeCommand(SectionResources.getString("JSFHtmlDataTableSection.CommandLabel.InsertSubTag"), _element, refchild, child); //$NON-NLS-1$
- insert.execute();
- _columnsViewer.refresh();
- updateButtonStatus();
- }
- }
- );
- }
-
- /**
- * Update the button status
- */
- private void updateButtonStatus()
- {
- _removeButton.setEnabled(true);
- _moveUpButton.setEnabled(true);
- _moveDownButton.setEnabled(true);
- ISelection selection = _columnsViewer.getSelection();
- if (selection.isEmpty())
- {
- _removeButton.setEnabled(false);
- _moveUpButton.setEnabled(false);
- _moveDownButton.setEnabled(false);
- }
- if (_columnsTable.getItemCount() == 0)
- {
- _removeButton.setEnabled(false);
- _moveUpButton.setEnabled(false);
- _moveDownButton.setEnabled(false);
- }
- if (_columnsTable.getSelectionCount() > 1)
- {
- _moveUpButton.setEnabled(false);
- _moveDownButton.setEnabled(false);
- }
- if (_columnsTable.getSelectionIndex() == 0)
- {
- _moveUpButton.setEnabled(false);
- }
- if (_columnsTable.getSelectionIndex() == _columnsTable.getItemCount() - 1)
- {
- _moveDownButton.setEnabled(false);
- }
- }
-
- public void setInput(IWorkbenchPart part, ISelection selection)
- {
- super.setInput(part, selection);
-
- _columnsViewer.setInput(_element);
-
- updateButtonStatus();
- }
-
- protected void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos)
- {
- if(_columnsViewer != null && !_columnsViewer.getControl().isDisposed())
- {
- _columnsViewer.refresh();
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlInputHiddenTypeSection.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlInputHiddenTypeSection.java
deleted file mode 100644
index 77c1be1..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlInputHiddenTypeSection.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.sections;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.IDialogFieldApplyListener;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.RadiosDialogField;
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.commands.single.ChangeTagCommand;
-import org.eclipse.jst.pagedesigner.properties.BaseCustomSection;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class JSFHtmlInputHiddenTypeSection extends BaseCustomSection
-{
- private RadiosDialogField _typesField;
-
- final private static String[] TYPES = { SectionResources.getString("JSFHtmlInputHiddenSection.Type0"), //$NON-NLS-1$
- SectionResources.getString("JSFHtmlInputHiddenSection.Type1"), //$NON-NLS-1$
- SectionResources.getString("JSFHtmlInputHiddenSection.Type2"), //$NON-NLS-1$
- SectionResources.getString("JSFHtmlInputHiddenSection.Type3") //$NON-NLS-1$
- };
-
- /**
- * The default constructor
- */
- public JSFHtmlInputHiddenTypeSection()
- {
- super();
- _typesField = new RadiosDialogField();
- _typesField.setLabelText(SectionResources.getString("JSFHtmlInputHiddenSection.Type")); //$NON-NLS-1$
- _typesField.setItems(TYPES);
- _typesField.setDialogFieldApplyListener(new IDialogFieldApplyListener()
- {
- public void dialogFieldApplied(DialogField field)
- {
- int type = _typesField.getSelectedIndex();
- String prefix = _element.getPrefix();
- String localTag = toLocalTag(type);
- String newtag = prefix + ":" + localTag; //$NON-NLS-1$
- Map attrs = new HashMap();
- if (type == IInputWidgetTypes.TEXTAREA)
- {
- // need to change "size" attribute to "cols"
- String size = _element.getAttribute(IJSFConstants.ATTR_SIZE);
- if (size != null && size.length() != 0)
- {
- attrs.put(IJSFConstants.ATTR_SIZE, null);
- attrs.put(IJSFConstants.ATTR_COLS, size);
- }
- }
- else
- {
- // need to change "cols" attribute to "size"
- String size = _element.getAttribute("cols"); //$NON-NLS-1$
- if (size != null && size.length() != 0)
- {
- attrs.put(IJSFConstants.ATTR_COLS, null);
- attrs.put(IJSFConstants.ATTR_SIZE, size);
- }
- }
- ChangeTagCommand c = new ChangeTagCommand(SectionResources
- .getString("JSFHtmlInputHidden.CommandLabel.ChangeType"), _element, newtag, attrs, true); //$NON-NLS-1$
- c.execute();
- _element = c.getNewElement();
- }
- });
- }
-
- public void createControls(Composite parent, TabbedPropertySheetPage aTabbedPropertySheetPage)
- {
- super.createControls(parent, aTabbedPropertySheetPage);
- TabbedPropertySheetWidgetFactory factory = aTabbedPropertySheetPage.getWidgetFactory();
- Composite top = factory.createFlatFormComposite(parent);
-
- int numberOfColumns = _typesField.getNumberOfControls();
- GridLayout layout = new GridLayout(numberOfColumns, false);
- top.setLayout(layout);
-
- _typesField.doFillIntoGrid(factory, top, numberOfColumns);
- LayoutUtil.setGrabHorizontal(_typesField.getGroup(factory, top), true);
- }
-
- private String toLocalTag(int type)
- {
- switch (type)
- {
- case IInputWidgetTypes.SECRET:
- return IJSFConstants.TAG_INPUTSECRET;
- case IInputWidgetTypes.HIDDEN:
- return IJSFConstants.TAG_INPUTHIDDEN;
- case IInputWidgetTypes.TEXTAREA:
- return IJSFConstants.TAG_INPUTTEXTAREA;
- case IInputWidgetTypes.TEXT:
- return IJSFConstants.TAG_INPUTTEXT;
- default:
- return IJSFConstants.TAG_INPUTHIDDEN;
- }
- }
-
- public void setInput(IWorkbenchPart part, ISelection selection)
- {
- super.setInput(part, selection);
-
- _typesField.setSelectedIndexWithoutUpdate(getInputType());
- }
-
- /**
- * @return the type of the input. One of TEXT, TEXTAREA, HIDDEN, SECRET.
- */
- public int getInputType()
- {
- String localTag = _element.getLocalName();
- if (IJSFConstants.TAG_INPUTTEXT.equals(localTag))
- {
- return IInputWidgetTypes.TEXT;
- }
- else if (IJSFConstants.TAG_INPUTSECRET.equals(localTag))
- {
- return IInputWidgetTypes.SECRET;
- }
- else if (IJSFConstants.TAG_INPUTHIDDEN.equals(localTag))
- {
- return IInputWidgetTypes.HIDDEN;
- }
- else if (IJSFConstants.TAG_INPUTTEXTAREA.equals(localTag))
- {
- return IInputWidgetTypes.TEXTAREA;
- }
- else
- {
- return IInputWidgetTypes.HIDDEN;
- }
- }
-
- protected void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue,
- Object newValue, int pos)
- {
- if (_typesField != null)
- {
- _typesField.setSelectedIndexWithoutUpdate(getInputType());
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlInputOthersSection.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlInputOthersSection.java
deleted file mode 100644
index 2da1a53..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlInputOthersSection.java
+++ /dev/null
@@ -1,868 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.sections;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.ICellModifier;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelection;
-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.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.commands.single.AddSubNodeCommand;
-import org.eclipse.jst.pagedesigner.commands.single.ChangeAttributeCommand;
-import org.eclipse.jst.pagedesigner.commands.single.RemoveSubNodeCommand;
-import org.eclipse.jst.pagedesigner.properties.BaseCustomSection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-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.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class JSFHtmlInputOthersSection extends BaseCustomSection
-{
- private Table _validatorsTable, _convertorsTable, _listenersTable;
- private TableViewer _validatorsViewer, _convertorsViewer, _listenersViewer;
-
- private Button _validateAddButton, _validateRemoveButton;
- private Button _convertAddButton, _convertRemoveButton;
- private Button _listenAddButton, _listenRemoveButton;
- private CCombo _validateTypeCombo, _convertTypeCombo, _listenTypeCombo;
- final private static String[] VALIDATETYPES = { "DoubleRange", "Length", "LongRange" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- };
- final private static String[] CONVERTTYPES = { "DateTime", "Number" //$NON-NLS-1$ //$NON-NLS-2$
- };
- final private static String[] LISTENTYPES = { "ValueChange" //$NON-NLS-1$
- };
- final private static String[] VALIDATORS_COLUMN_NAMES = { IJSFConstants.TAG_VALIDATOR, IJSFConstants.ATTR_MINIMUM,
- IJSFConstants.ATTR_MAXIMUM };
-
- private class ValidateContentLabelProvider implements IStructuredContentProvider, ITableLabelProvider
- {
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
- */
- public Object[] getElements(Object inputElement)
- {
- IDOMElement root = _element;
- List result = new ArrayList();
-
- NodeList children = root.getChildNodes();
- for (int i = 0, n = children.getLength(); i < n; i++)
- {
- Node child = children.item(i);
- if (child.getNodeType() == Node.ELEMENT_NODE)
- {
- IDOMElement element = (IDOMElement) child;
- String nodeName = element.getNodeName();
- if (nodeName.indexOf("validat") != -1) //$NON-NLS-1$
- {
- result.add(child);
- }
- }
- }
-
- if (result.isEmpty())
- {
- return new Object[0];
- }
-
- return result.toArray(new IDOMElement[result.size()]);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
- */
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
- {
- // no support for input changed
- }
-
- public String getColumnText(Object element, int columnIndex)
- {
- String result = null;
- if (element instanceof IDOMElement)
- {
- IDOMElement node = (IDOMElement) element;
- String nodeName = node.getNodeName();
- switch (columnIndex)
- {
- case 0:
- result = nodeName;
- break;
- case 1:
- result = node.getAttribute(IJSFConstants.ATTR_MINIMUM);
- break;
- case 2:
- result = node.getAttribute(IJSFConstants.ATTR_MAXIMUM);
- break;
- default:
- break;
- }
- }
- return result != null ? result : ""; //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IContentProvider#dispose()
- */
-
- public void dispose()
- {
- // nothing to dispose
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
- */
- public Image getColumnImage(Object element, int columnIndex)
- {
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- public void addListener(ILabelProviderListener listener)
- {
- // TODO: no support for listeners?
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)
- */
- public boolean isLabelProperty(Object element, String property)
- {
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- public void removeListener(ILabelProviderListener listener)
- {
- // TODO: no support for listeners?
- }
- }
-
- private class ValidateCellModifier implements ICellModifier
- {
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ICellModifier#canModify(java.lang.Object, java.lang.String)
- */
- public boolean canModify(Object element, String property)
- {
- int columnIndex = getColumnNames().indexOf(property);
-
- if (columnIndex == 0)
- {
- return false;
- }
- return true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ICellModifier#getValue(java.lang.Object, java.lang.String)
- */
- public Object getValue(Object element, String property)
- {
- int columnIndex = getColumnNames().indexOf(property);
-
- Object result = null;
- IDOMElement node = (IDOMElement) element;
- switch (columnIndex)
- {
- case 0: // Node Name
- result = node.getNodeName();
- break;
- case 1: // Min
- result = node.getAttribute(IJSFConstants.ATTR_MINIMUM);
- break;
- case 2: // Max
- result = node.getAttribute(IJSFConstants.ATTR_MAXIMUM);
- break;
- default:
- result = ""; //$NON-NLS-1$
- }
- return result != null ? result : ""; //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ICellModifier#modify(java.lang.Object, java.lang.String, java.lang.Object)
- */
- public void modify(Object element, String property, Object value)
- {
- int columnIndex = getColumnNames().indexOf(property);
-
- TableItem item = (TableItem) element;
- IDOMElement node = (IDOMElement) item.getData();
- String valueString;
- ChangeAttributeCommand c;
- switch (columnIndex)
- {
- case 1: // Min
- valueString = ((String) value).trim();
- c = new ChangeAttributeCommand(
- SectionResources.getString("JSFHtmlInputTextSection.CommandLabel.ChangeAttribute"), node, IJSFConstants.ATTR_MINIMUM, valueString); //$NON-NLS-1$
- c.execute();
- break;
- case 2: // Max
- valueString = ((String) value).trim();
- c = new ChangeAttributeCommand(
- SectionResources.getString("JSFHtmlInputTextSection.CommandLabel.ChangeAttribute"), node, IJSFConstants.ATTR_MAXIMUM, valueString); //$NON-NLS-1$
- c.execute();
- break;
- default:
- break;
- }
- _validatorsViewer.refresh();
-// _validatorsViewer.setInput(_element);
- updateValidateButtonStatus();
- }
- }
-
- private class ConvertContentLabelProvider implements IStructuredContentProvider, ITableLabelProvider
- {
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
- */
- public Object[] getElements(Object inputElement)
- {
- IDOMElement root = _element;
- List result = new ArrayList();
-
- NodeList children = root.getChildNodes();
- for (int i = 0, n = children.getLength(); i < n; i++)
- {
- Node child = children.item(i);
- if (child.getNodeType() == Node.ELEMENT_NODE)
- {
- IDOMElement element = (IDOMElement) child;
- String nodeName = element.getNodeName();
- if (nodeName.indexOf("convert") != -1) //$NON-NLS-1$
- {
- result.add(child);
- }
- }
- }
-
- if (result.isEmpty())
- {
- return new Object[0];
- }
-
- return result.toArray(new IDOMElement[result.size()]);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
- */
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
- {
- // do nothing
- }
-
- public String getColumnText(Object element, int columnIndex)
- {
- String result = null;
- if (element instanceof IDOMElement)
- {
- IDOMElement node = (IDOMElement) element;
- String nodeName = node.getNodeName();
- switch (columnIndex)
- {
- case 0:
- result = nodeName;
- break;
- default:
- break;
- }
- }
- return result != null ? result : ""; //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IContentProvider#dispose()
- */
-
- public void dispose()
- {
- // nothing to dispose
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
- */
- public Image getColumnImage(Object element, int columnIndex)
- {
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- public void addListener(ILabelProviderListener listener)
- {
- // TODO: no support for listeners?
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)
- */
- public boolean isLabelProperty(Object element, String property)
- {
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- public void removeListener(ILabelProviderListener listener)
- {
- // TODO: no support for listeners?
- }
- }
-
- private class ListenerContentLabelProvider implements IStructuredContentProvider, ITableLabelProvider
- {
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
- */
- public Object[] getElements(Object inputElement)
- {
- IDOMElement root = _element;
- List result = new ArrayList();
-
- NodeList children = root.getChildNodes();
- for (int i = 0, n = children.getLength(); i < n; i++)
- {
- Node child = children.item(i);
- if (child.getNodeType() == Node.ELEMENT_NODE)
- {
- IDOMElement element = (IDOMElement) child;
- String nodeName = element.getNodeName();
- if (nodeName.indexOf("Listener") != -1) //$NON-NLS-1$
- {
- result.add(child);
- }
- }
- }
-
- if (result.isEmpty())
- {
- return new Object[0];
- }
-
- return result.toArray(new IDOMElement[result.size()]);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
- */
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
- {
- // do nothing
- }
-
- public String getColumnText(Object element, int columnIndex)
- {
- String result = null;
- if (element instanceof IDOMElement)
- {
- IDOMElement node = (IDOMElement) element;
- String nodeName = node.getNodeName();
- switch (columnIndex)
- {
- case 0:
- result = nodeName;
- break;
- default:
- break;
- }
- }
- return result != null ? result : ""; //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IContentProvider#dispose()
- */
-
- public void dispose()
- {
- // nothing to dispose
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
- */
- public Image getColumnImage(Object element, int columnIndex)
- {
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- public void addListener(ILabelProviderListener listener)
- {
- // TODO: no support for listeners?
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)
- */
- public boolean isLabelProperty(Object element, String property)
- {
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- public void removeListener(ILabelProviderListener listener)
- {
- // TODO: no support for listeners?
- }
- }
-
- /**
- * The default constructor
- */
- public JSFHtmlInputOthersSection()
- {
- super();
- }
-
- public void createControls(Composite parent, TabbedPropertySheetPage aTabbedPropertySheetPage)
- {
- super.createControls(parent, aTabbedPropertySheetPage);
- TabbedPropertySheetWidgetFactory factory = aTabbedPropertySheetPage.getWidgetFactory();
- Composite top = factory.createFlatFormComposite(parent);
-
- GridLayout layout = new GridLayout();
- layout.numColumns = 4;
- top.setLayout(layout);
-
- createValidatePart(factory, top);
-
- createConvertPart(factory, top);
-
- createListenPart(factory, top);
- }
-
- /**
- * @param factory
- * @param other
- */
- private void createConvertPart(TabbedPropertySheetWidgetFactory factory, Composite other)
- {
- GridData data;
- _convertorsTable = factory.createTable(other, SWT.FULL_SELECTION | SWT.MULTI);
- data = new GridData(GridData.FILL_BOTH);
- data.horizontalSpan = 3;
- data.verticalSpan = 3;
- data.heightHint = 50;
- _convertorsTable.setHeaderVisible(true);
- _convertorsTable.setLayoutData(data);
- _convertorsTable.setLinesVisible(true);
-
- TableColumn convertColumn = new TableColumn(_convertorsTable, SWT.NONE);
- convertColumn.setText(SectionResources.getString("JSFHtmlInputTextSection.Converter")); //$NON-NLS-1$
- convertColumn.setWidth(150);
-
- _convertorsViewer = new TableViewer(_convertorsTable);
- _convertorsViewer.setContentProvider(new ConvertContentLabelProvider());
- _convertorsViewer.setLabelProvider(new ConvertContentLabelProvider());
- _convertorsViewer.addDoubleClickListener(new IDoubleClickListener()
- {
- public void doubleClick(DoubleClickEvent event)
- {
- IStructuredSelection selection = (IStructuredSelection) event.getSelection();
- if (selection != null)
- {
- IDOMElement node = (IDOMElement) selection.getFirstElement();
- gotoNode(node);
- }
- }
- });
- _convertorsViewer.addSelectionChangedListener(new ISelectionChangedListener()
- {
- public void selectionChanged(SelectionChangedEvent event)
- {
- updateConvertButtonStatus();
- }
- });
-
- _convertTypeCombo = factory.createCCombo(other, SWT.READ_ONLY);
- _convertTypeCombo.setItems(CONVERTTYPES);
- _convertTypeCombo.select(0);
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- _convertTypeCombo.setLayoutData(data);
-
- _convertAddButton = factory.createButton(other, SectionResources.getString("JSFHtmlInputTextSection.Add"), //$NON-NLS-1$
- SWT.NONE);
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- _convertAddButton.setLayoutData(data);
- _convertAddButton.addSelectionListener(new SelectionAdapter()
- {
- public void widgetSelected(SelectionEvent e)
- {
- Map attributes = new HashMap();
- AddSubNodeCommand c = new AddSubNodeCommand(SectionResources
- .getString("JSFHtmlInputTextSection.CommandLabel.AddSubTag"), _element, "convert" //$NON-NLS-1$ //$NON-NLS-2$
- + _convertTypeCombo.getText(), ITLDConstants.URI_JSF_CORE, attributes);
- c.execute();
- _convertorsViewer.refresh();
- updateConvertButtonStatus();
- }
- });
- _convertRemoveButton = factory.createButton(other,
- SectionResources.getString("JSFHtmlInputTextSection.Remove"), SWT.NONE); //$NON-NLS-1$
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- _convertRemoveButton.setLayoutData(data);
- _convertRemoveButton.addSelectionListener(new SelectionAdapter()
- {
- public void widgetSelected(SelectionEvent e)
- {
- IStructuredSelection selection = (IStructuredSelection) _convertorsViewer.getSelection();
- if (selection != null)
- {
- for (Iterator i = selection.iterator(); i.hasNext();)
- {
- IDOMElement node = (IDOMElement) i.next();
- RemoveSubNodeCommand c = new RemoveSubNodeCommand(SectionResources
- .getString("JSFHtmlInputTextSection.CommandLabel.RemoveSubTag"), _element, node); //$NON-NLS-1$
- c.execute();
- }
- _convertorsViewer.refresh();
- updateConvertButtonStatus();
- }
- }
- });
- }
-
- /**
- * @param factory
- * @param other
- */
- private void createListenPart(TabbedPropertySheetWidgetFactory factory, Composite other)
- {
- GridData data;
- _listenersTable = factory.createTable(other, SWT.FULL_SELECTION | SWT.MULTI);
- data = new GridData(GridData.FILL_BOTH);
- data.horizontalSpan = 3;
- data.verticalSpan = 3;
- data.heightHint = 50;
- _listenersTable.setHeaderVisible(true);
- _listenersTable.setLayoutData(data);
- _listenersTable.setLinesVisible(true);
-
- TableColumn listenColumn = new TableColumn(_listenersTable, SWT.NONE);
- listenColumn.setText(SectionResources.getString("JSFHtmlInputTextSection.Listeners")); //$NON-NLS-1$
- listenColumn.setWidth(150);
-
- _listenersViewer = new TableViewer(_listenersTable);
- _listenersViewer.setContentProvider(new ListenerContentLabelProvider());
- _listenersViewer.setLabelProvider(new ListenerContentLabelProvider());
- _listenersViewer.addDoubleClickListener(new IDoubleClickListener()
- {
- public void doubleClick(DoubleClickEvent event)
- {
- IStructuredSelection selection = (IStructuredSelection) event.getSelection();
- if (selection != null)
- {
- IDOMElement node = (IDOMElement) selection.getFirstElement();
- gotoNode(node);
- }
- }
- });
- _listenersViewer.addSelectionChangedListener(new ISelectionChangedListener()
- {
- public void selectionChanged(SelectionChangedEvent event)
- {
- updateListenButtonStatus();
- }
- });
-
- _listenTypeCombo = factory.createCCombo(other, SWT.READ_ONLY);
- _listenTypeCombo.setItems(LISTENTYPES);
- _listenTypeCombo.select(0);
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- _listenTypeCombo.setLayoutData(data);
-
- _listenAddButton = factory.createButton(other, SectionResources.getString("JSFHtmlInputTextSection.Add"), //$NON-NLS-1$
- SWT.NONE);
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- _listenAddButton.setLayoutData(data);
- _listenAddButton.addSelectionListener(new SelectionAdapter()
- {
- public void widgetSelected(SelectionEvent e)
- {
- Map attributes = new HashMap();
- String listener = _listenTypeCombo.getText();
- listener = listener.substring(0, 1).toLowerCase() + listener.substring(1) + "Listener"; //$NON-NLS-1$
- AddSubNodeCommand c = new AddSubNodeCommand(
- SectionResources.getString("JSFHtmlInputTextSection.CommandLabel.AddSubTag"), _element, listener, ITLDConstants.URI_JSF_CORE, attributes); //$NON-NLS-1$
- c.execute();
- _listenersViewer.refresh();
- updateListenButtonStatus();
- }
- });
- _listenRemoveButton = factory.createButton(other,
- SectionResources.getString("JSFHtmlInputTextSection.Remove"), SWT.NONE); //$NON-NLS-1$
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- _listenRemoveButton.setLayoutData(data);
- _listenRemoveButton.addSelectionListener(new SelectionAdapter()
- {
- public void widgetSelected(SelectionEvent e)
- {
- IStructuredSelection selection = (IStructuredSelection) _listenersViewer.getSelection();
- if (selection != null)
- {
- for (Iterator i = selection.iterator(); i.hasNext();)
- {
- IDOMElement node = (IDOMElement) i.next();
- RemoveSubNodeCommand c = new RemoveSubNodeCommand(SectionResources
- .getString("JSFHtmlInputTextSection.CommandLabel.RemoveSubTag"), _element, node); //$NON-NLS-1$
- c.execute();
- }
- _listenersViewer.refresh();
- updateListenButtonStatus();
- }
- }
- });
- }
-
- /**
- * @param factory
- * @param other
- */
- private void createValidatePart(TabbedPropertySheetWidgetFactory factory, Composite other)
- {
- GridData data;
- _validatorsTable = factory.createTable(other, SWT.FULL_SELECTION | SWT.MULTI);
- data = new GridData(GridData.FILL_BOTH);
- data.horizontalSpan = 3;
- data.verticalSpan = 3;
- data.heightHint = 50;
- _validatorsTable.setHeaderVisible(true);
- _validatorsTable.setLayoutData(data);
- _validatorsTable.setLinesVisible(true);
-
- TableColumn validateColumn = new TableColumn(_validatorsTable, SWT.NONE);
- validateColumn.setText(SectionResources.getString("JSFHtmlInputTextSection.Validators")); //$NON-NLS-1$
- validateColumn.setWidth(150);
-
- TableColumn minColumn = new TableColumn(_validatorsTable, SWT.NONE);
- minColumn.setText(SectionResources.getString("JSFHtmlInputTextSection.Minimum")); //$NON-NLS-1$
- minColumn.setWidth(100);
-
- TableColumn maxColumn = new TableColumn(_validatorsTable, SWT.NONE);
- maxColumn.setText(SectionResources.getString("JSFHtmlInputTextSection.Maximum")); //$NON-NLS-1$
- maxColumn.setWidth(100);
-
- _validatorsViewer = new TableViewer(_validatorsTable);
- _validatorsViewer.setColumnProperties(VALIDATORS_COLUMN_NAMES);
-
- CellEditor[] editors = new CellEditor[VALIDATORS_COLUMN_NAMES.length];
- TextCellEditor textEditor = new TextCellEditor(_validatorsTable);
- editors[0] = textEditor;
- textEditor = new TextCellEditor(_validatorsTable);
- editors[1] = textEditor;
- textEditor = new TextCellEditor(_validatorsTable);
- editors[2] = textEditor;
-
- _validatorsViewer.setCellEditors(editors);
- _validatorsViewer.setCellModifier(new ValidateCellModifier());
- _validatorsViewer.setContentProvider(new ValidateContentLabelProvider());
- _validatorsViewer.setLabelProvider(new ValidateContentLabelProvider());
- _validatorsViewer.addDoubleClickListener(new IDoubleClickListener()
- {
- public void doubleClick(DoubleClickEvent event)
- {
- IStructuredSelection selection = (IStructuredSelection) event.getSelection();
- if (selection != null)
- {
- IDOMElement node = (IDOMElement) selection.getFirstElement();
- gotoNode(node);
- }
- }
- });
- _validatorsViewer.addSelectionChangedListener(new ISelectionChangedListener()
- {
- public void selectionChanged(SelectionChangedEvent event)
- {
- updateValidateButtonStatus();
- }
- });
-
- _validateTypeCombo = factory.createCCombo(other, SWT.READ_ONLY);
- _validateTypeCombo.setItems(VALIDATETYPES);
- _validateTypeCombo.select(0);
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- _validateTypeCombo.setLayoutData(data);
-
- _validateAddButton = factory.createButton(other, SectionResources.getString("JSFHtmlInputTextSection.Add"), //$NON-NLS-1$
- SWT.NONE);
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- _validateAddButton.setLayoutData(data);
- _validateAddButton.addSelectionListener(new SelectionAdapter()
- {
- public void widgetSelected(SelectionEvent e)
- {
- Map attributes = new HashMap();
- AddSubNodeCommand c = new AddSubNodeCommand(SectionResources
- .getString("JSFHtmlInputTextSection.CommandLabel.AddSubTag"), _element, "validate" //$NON-NLS-1$ //$NON-NLS-2$
- + _validateTypeCombo.getText(), ITLDConstants.URI_JSF_CORE, attributes);
- c.execute();
- _validatorsViewer.refresh();
- updateValidateButtonStatus();
- }
- });
- _validateRemoveButton = factory.createButton(other, SectionResources
- .getString("JSFHtmlInputTextSection.Remove"), SWT.NONE); //$NON-NLS-1$
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- _validateRemoveButton.setLayoutData(data);
- _validateRemoveButton.addSelectionListener(new SelectionAdapter()
- {
- public void widgetSelected(SelectionEvent e)
- {
- IStructuredSelection selection = (IStructuredSelection) _validatorsViewer.getSelection();
- if (selection != null)
- {
- for (Iterator i = selection.iterator(); i.hasNext();)
- {
- IDOMElement node = (IDOMElement) i.next();
- RemoveSubNodeCommand c = new RemoveSubNodeCommand(SectionResources
- .getString("JSFHtmlInputTextSection.CommandLabel.RemoveSubTag"), _element, node); //$NON-NLS-1$
- c.execute();
- }
- _validatorsViewer.refresh();
- updateValidateButtonStatus();
- }
- }
- });
- }
-
- private void updateValidateButtonStatus()
- {
- _validateRemoveButton.setEnabled(true);
- ISelection selection = _validatorsViewer.getSelection();
- if (selection == null || selection.isEmpty())
- {
- _validateRemoveButton.setEnabled(false);
- }
- if (_validatorsTable.getItemCount() == 0)
- {
- _validateRemoveButton.setEnabled(false);
- }
- }
-
- private void updateConvertButtonStatus()
- {
- _convertAddButton.setEnabled(true);
- _convertRemoveButton.setEnabled(true);
- ISelection selection = _convertorsViewer.getSelection();
- if (selection == null || selection.isEmpty())
- {
- _convertRemoveButton.setEnabled(false);
- }
- if (_convertorsTable.getItemCount() == 0)
- {
- _convertRemoveButton.setEnabled(false);
- }
- if (_convertorsTable.getItemCount() > 0)
- {
- _convertAddButton.setEnabled(false);
- }
- }
-
- private void updateListenButtonStatus()
- {
- _listenRemoveButton.setEnabled(true);
- ISelection selection = _listenersViewer.getSelection();
- if (selection == null || selection.isEmpty())
- {
- _listenRemoveButton.setEnabled(false);
- }
- if (_listenersTable.getItemCount() == 0)
- {
- _listenRemoveButton.setEnabled(false);
- }
- }
-
- public void setInput(IWorkbenchPart part, ISelection selection)
- {
- super.setInput(part, selection);
-
- _validatorsViewer.setInput(_element);
- updateValidateButtonStatus();
-
- _convertorsViewer.setInput(_element);
- updateConvertButtonStatus();
-
- _listenersViewer.setInput(_element);
- updateListenButtonStatus();
- }
-
- private List getColumnNames()
- {
- return Arrays.asList(VALIDATORS_COLUMN_NAMES);
- }
-
- protected void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos)
- {
- if(_validatorsViewer != null && !_validatorsViewer.getControl().isDisposed())
- {
- _validatorsViewer.refresh();
- _convertorsViewer.refresh();
- _listenersViewer.refresh();
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlInputSecretTypeSection.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlInputSecretTypeSection.java
deleted file mode 100644
index 76b49ea..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlInputSecretTypeSection.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.sections;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.IDialogFieldApplyListener;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.RadiosDialogField;
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.commands.single.ChangeTagCommand;
-import org.eclipse.jst.pagedesigner.properties.BaseCustomSection;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class JSFHtmlInputSecretTypeSection extends BaseCustomSection
-{
- private RadiosDialogField _typesField;
-
- final private static String[] TYPES = { SectionResources.getString("JSFHtmlInputHiddenSection.Type0"), //$NON-NLS-1$
- SectionResources.getString("JSFHtmlInputHiddenSection.Type1"), //$NON-NLS-1$
- SectionResources.getString("JSFHtmlInputHiddenSection.Type2"), //$NON-NLS-1$
- SectionResources.getString("JSFHtmlInputHiddenSection.Type3") //$NON-NLS-1$
- };
-
- /**
- * The default constructor
- */
- public JSFHtmlInputSecretTypeSection()
- {
- super();
- _typesField = new RadiosDialogField();
- _typesField.setLabelText(SectionResources.getString("JSFHtmlInputHiddenSection.Type")); //$NON-NLS-1$
- _typesField.setItems(TYPES);
- _typesField.setDialogFieldApplyListener(new IDialogFieldApplyListener()
- {
- public void dialogFieldApplied(DialogField field)
- {
- int type = _typesField.getSelectedIndex();
- String prefix = _element.getPrefix();
- String localTag = toLocalTag(type);
- String newtag = prefix + ":" + localTag; //$NON-NLS-1$
- Map attrs = new HashMap();
- if (type == IInputWidgetTypes.TEXTAREA)
- {
- // need to change "size" attribute to "cols"
- String size = _element.getAttribute(IJSFConstants.ATTR_SIZE);
- if (size != null && size.length() != 0)
- {
- attrs.put(IJSFConstants.ATTR_SIZE, null);
- attrs.put(IJSFConstants.ATTR_COLS, size);
- }
- }
- else
- {
- // need to change "cols" attribute to "size"
- String size = _element.getAttribute(IJSFConstants.ATTR_COLS);
- if (size != null && size.length() != 0)
- {
- attrs.put(IJSFConstants.ATTR_COLS, null);
- attrs.put(IJSFConstants.ATTR_SIZE, size);
- }
- }
- ChangeTagCommand c = new ChangeTagCommand(SectionResources
- .getString("JSFHtmlInputHidden.CommandLabel.ChangeType"), _element, newtag, attrs, true); //$NON-NLS-1$
- c.execute();
- _element = c.getNewElement();
- }
- });
- }
-
- public void createControls(Composite parent, TabbedPropertySheetPage aTabbedPropertySheetPage)
- {
- super.createControls(parent, aTabbedPropertySheetPage);
- TabbedPropertySheetWidgetFactory factory = aTabbedPropertySheetPage.getWidgetFactory();
- Composite top = factory.createFlatFormComposite(parent);
-
- int numberOfColumns = _typesField.getNumberOfControls();
- GridLayout layout = new GridLayout(numberOfColumns, false);
- top.setLayout(layout);
-
- _typesField.doFillIntoGrid(factory, top, numberOfColumns);
- LayoutUtil.setGrabHorizontal(_typesField.getGroup(factory, top), true);
- }
-
- private String toLocalTag(int type)
- {
- switch (type)
- {
- case IInputWidgetTypes.SECRET:
- return IJSFConstants.TAG_INPUTSECRET;
- case IInputWidgetTypes.HIDDEN:
- return IJSFConstants.TAG_INPUTHIDDEN;
- case IInputWidgetTypes.TEXTAREA:
- return IJSFConstants.TAG_INPUTTEXTAREA;
- case IInputWidgetTypes.TEXT:
- return IJSFConstants.TAG_INPUTTEXT;
- default:
- return IJSFConstants.TAG_INPUTHIDDEN;
- }
- }
-
- public void setInput(IWorkbenchPart part, ISelection selection)
- {
- super.setInput(part, selection);
- _typesField.setSelectedIndexWithoutUpdate(getInputType());
- }
-
- /**
- * @return the input type
- */
- public int getInputType()
- {
- String localTag = _element.getLocalName();
- if (IJSFConstants.TAG_INPUTTEXT.equals(localTag))
- {
- return IInputWidgetTypes.TEXT;
- }
- else if (IJSFConstants.TAG_INPUTSECRET.equals(localTag))
- {
- return IInputWidgetTypes.SECRET;
- }
- else if (IJSFConstants.TAG_INPUTHIDDEN.equals(localTag))
- {
- return IInputWidgetTypes.HIDDEN;
- }
- else if (IJSFConstants.TAG_INPUTTEXTAREA.equals(localTag))
- {
- return IInputWidgetTypes.TEXTAREA;
- }
- else
- {
- return IInputWidgetTypes.HIDDEN;
- }
- }
-
- protected void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue,
- Object newValue, int pos)
- {
- if (_typesField != null)
- {
- _typesField.setSelectedIndexWithoutUpdate(getInputType());
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlInputTextTypeSection.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlInputTextTypeSection.java
deleted file mode 100644
index 26befdf..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlInputTextTypeSection.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.sections;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.IDialogFieldApplyListener;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.RadiosDialogField;
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.commands.single.ChangeTagCommand;
-import org.eclipse.jst.pagedesigner.properties.BaseCustomSection;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class JSFHtmlInputTextTypeSection extends BaseCustomSection
-{
- private RadiosDialogField _typesField;
-
- final private static String[] TYPES = { SectionResources.getString("JSFHtmlInputHiddenSection.Type0"), //$NON-NLS-1$
- SectionResources.getString("JSFHtmlInputHiddenSection.Type1"), //$NON-NLS-1$
- SectionResources.getString("JSFHtmlInputHiddenSection.Type2"), //$NON-NLS-1$
- SectionResources.getString("JSFHtmlInputHiddenSection.Type3") //$NON-NLS-1$
- };
-
- /**
- * The default constructor
- */
- public JSFHtmlInputTextTypeSection()
- {
- super();
- _typesField = new RadiosDialogField();
- _typesField.setLabelText(SectionResources.getString("JSFHtmlInputHiddenSection.Type")); //$NON-NLS-1$
- _typesField.setItems(TYPES);
- _typesField.setDialogFieldApplyListener(new IDialogFieldApplyListener()
- {
- public void dialogFieldApplied(DialogField field)
- {
- int type = _typesField.getSelectedIndex();
- String prefix = _element.getPrefix();
- String localTag = toLocalTag(type);
- String newtag = prefix + ":" + localTag; //$NON-NLS-1$
- Map attrs = new HashMap();
- if (type == IInputWidgetTypes.TEXTAREA)
- {
- // need to change "size" attribute to "cols"
- String size = _element.getAttribute(IJSFConstants.ATTR_SIZE);
- if (size != null && size.length() != 0)
- {
- attrs.put(IJSFConstants.ATTR_SIZE, null);
- attrs.put(IJSFConstants.ATTR_COLS, size);
- }
- }
- else
- {
- // need to change "cols" attribute to "size"
- String size = _element.getAttribute(IJSFConstants.ATTR_COLS);
- if (size != null && size.length() != 0)
- {
- attrs.put(IJSFConstants.ATTR_COLS, null);
- attrs.put(IJSFConstants.ATTR_SIZE, size);
- }
- }
- ChangeTagCommand c = new ChangeTagCommand(SectionResources
- .getString("JSFHtmlInputHidden.CommandLabel.ChangeType"), _element, newtag, attrs, true); //$NON-NLS-1$
- c.execute();
- _element = c.getNewElement();
- }
- });
- }
-
- public void createControls(Composite parent, TabbedPropertySheetPage aTabbedPropertySheetPage)
- {
- super.createControls(parent, aTabbedPropertySheetPage);
- TabbedPropertySheetWidgetFactory factory = aTabbedPropertySheetPage.getWidgetFactory();
- Composite top = factory.createFlatFormComposite(parent);
-
- int numberOfColumns = _typesField.getNumberOfControls();
- GridLayout layout = new GridLayout(numberOfColumns, false);
- top.setLayout(layout);
-
- _typesField.doFillIntoGrid(factory, top, numberOfColumns);
- LayoutUtil.setGrabHorizontal(_typesField.getGroup(factory, top), true);
- }
-
- private String toLocalTag(int type)
- {
- switch (type)
- {
- case IInputWidgetTypes.SECRET:
- return IJSFConstants.TAG_INPUTSECRET;
- case IInputWidgetTypes.HIDDEN:
- return IJSFConstants.TAG_INPUTHIDDEN;
- case IInputWidgetTypes.TEXTAREA:
- return IJSFConstants.TAG_INPUTTEXTAREA;
- case IInputWidgetTypes.TEXT:
- return IJSFConstants.TAG_INPUTTEXT;
- default:
- return IJSFConstants.TAG_INPUTHIDDEN;
- }
- }
-
- public void setInput(IWorkbenchPart part, ISelection selection)
- {
- super.setInput(part, selection);
-
- _typesField.setSelectedIndexWithoutUpdate(getInputType());
- }
-
- /**
- * @return the input type. One of IInputWidgetTypes.
- */
- public int getInputType()
- {
- String localTag = _element.getLocalName();
- if (IJSFConstants.TAG_INPUTTEXT.equals(localTag))
- {
- return IInputWidgetTypes.TEXT;
- }
- else if (IJSFConstants.TAG_INPUTSECRET.equals(localTag))
- {
- return IInputWidgetTypes.SECRET;
- }
- else if (IJSFConstants.TAG_INPUTHIDDEN.equals(localTag))
- {
- return IInputWidgetTypes.HIDDEN;
- }
- else if (IJSFConstants.TAG_INPUTTEXTAREA.equals(localTag))
- {
- return IInputWidgetTypes.TEXTAREA;
- }
- else
- {
- return IInputWidgetTypes.HIDDEN;
- }
- }
-
- protected void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue,
- Object newValue, int pos)
- {
- if (_typesField != null)
- {
- _typesField.setSelectedIndexWithoutUpdate(getInputType());
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlInputTextareaTypeSection.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlInputTextareaTypeSection.java
deleted file mode 100644
index 8c70c1a..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlInputTextareaTypeSection.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.sections;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.IDialogFieldApplyListener;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.RadiosDialogField;
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.commands.single.ChangeTagCommand;
-import org.eclipse.jst.pagedesigner.properties.BaseCustomSection;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-
-/**
- * FIXME: there is a lot of copied code for this input sections
- * @author mengbo
- * @version 1.5
- */
-public class JSFHtmlInputTextareaTypeSection extends BaseCustomSection
-{
- private RadiosDialogField _typesField;
-
- final private static String[] TYPES = { SectionResources.getString("JSFHtmlInputHiddenSection.Type0"), //$NON-NLS-1$
- SectionResources.getString("JSFHtmlInputHiddenSection.Type1"), //$NON-NLS-1$
- SectionResources.getString("JSFHtmlInputHiddenSection.Type2"), //$NON-NLS-1$
- SectionResources.getString("JSFHtmlInputHiddenSection.Type3") //$NON-NLS-1$
- };
-
- /**
- * The default constructor
- */
- public JSFHtmlInputTextareaTypeSection()
- {
- super();
- _typesField = new RadiosDialogField();
- _typesField.setLabelText(SectionResources.getString("JSFHtmlInputHiddenSection.Type")); //$NON-NLS-1$
- _typesField.setItems(TYPES);
- _typesField.setDialogFieldApplyListener(new IDialogFieldApplyListener()
- {
- public void dialogFieldApplied(DialogField field)
- {
- int type = _typesField.getSelectedIndex();
- String prefix = _element.getPrefix();
- String localTag = toLocalTag(type);
- String newtag = prefix + ":" + localTag; //$NON-NLS-1$
- Map attrs = new HashMap();
- if (type == IInputWidgetTypes.TEXTAREA)
- {
- // need to change "size" attribute to "cols"
- String size = _element.getAttribute(IJSFConstants.ATTR_SIZE);
- if (size != null && size.length() != 0)
- {
- attrs.put(IJSFConstants.ATTR_SIZE, null);
- attrs.put(IJSFConstants.ATTR_COLS, size);
- }
- }
- else
- {
- // need to change "cols" attribute to "size"
- String size = _element.getAttribute(IJSFConstants.ATTR_COLS);
- if (size != null && size.length() != 0)
- {
- attrs.put(IJSFConstants.ATTR_COLS, null); //$NON-NLS-1$
- attrs.put(IJSFConstants.ATTR_SIZE, size); //$NON-NLS-1$
- }
- }
- ChangeTagCommand c = new ChangeTagCommand(SectionResources
- .getString("JSFHtmlInputHidden.CommandLabel.ChangeType"), _element, newtag, attrs, true); //$NON-NLS-1$
- c.execute();
- _element = c.getNewElement();
- }
- });
- }
-
- public void createControls(Composite parent, TabbedPropertySheetPage aTabbedPropertySheetPage)
- {
- super.createControls(parent, aTabbedPropertySheetPage);
- TabbedPropertySheetWidgetFactory factory = aTabbedPropertySheetPage.getWidgetFactory();
- Composite top = factory.createFlatFormComposite(parent);
-
- int numberOfColumns = _typesField.getNumberOfControls();
- GridLayout layout = new GridLayout(numberOfColumns, false);
- top.setLayout(layout);
-
- _typesField.doFillIntoGrid(factory, top, numberOfColumns);
- LayoutUtil.setGrabHorizontal(_typesField.getGroup(factory, top), true);
- }
-
- private String toLocalTag(int type)
- {
- switch (type)
- {
- case IInputWidgetTypes.SECRET:
- return IJSFConstants.TAG_INPUTSECRET;
- case IInputWidgetTypes.HIDDEN:
- return IJSFConstants.TAG_INPUTHIDDEN;
- case IInputWidgetTypes.TEXTAREA:
- return IJSFConstants.TAG_INPUTTEXTAREA;
- case IInputWidgetTypes.TEXT:
- return IJSFConstants.TAG_INPUTTEXT;
- default:
- return IJSFConstants.TAG_INPUTHIDDEN;
- }
- }
-
- public void setInput(IWorkbenchPart part, ISelection selection)
- {
- super.setInput(part, selection);
-
- _typesField.setSelectedIndexWithoutUpdate(getInputType());
- }
-
- /**
- * @return one of IInputWidgetTypes
- */
- public int getInputType()
- {
- String localTag = _element.getLocalName();
- if (IJSFConstants.TAG_INPUTTEXT.equals(localTag))
- {
- return IInputWidgetTypes.TEXT;
- }
- else if (IJSFConstants.TAG_INPUTSECRET.equals(localTag))
- {
- return IInputWidgetTypes.SECRET;
- }
- else if (IJSFConstants.TAG_INPUTHIDDEN.equals(localTag))
- {
- return IInputWidgetTypes.HIDDEN;
- }
- else if (IJSFConstants.TAG_INPUTTEXTAREA.equals(localTag))
- {
- return IInputWidgetTypes.TEXTAREA;
- }
- else
- {
- return IInputWidgetTypes.HIDDEN;
- }
- }
-
- protected void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue,
- Object newValue, int pos)
- {
- if (_typesField != null)
- {
- _typesField.setSelectedIndexWithoutUpdate(getInputType());
- }
-
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlOutputFormatParamsSection.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlOutputFormatParamsSection.java
deleted file mode 100644
index 1d307cf..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlOutputFormatParamsSection.java
+++ /dev/null
@@ -1,401 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.sections;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.ICellModifier;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelection;
-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.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.commands.single.AddSubNodeCommand;
-import org.eclipse.jst.pagedesigner.commands.single.ChangeAttributeCommand;
-import org.eclipse.jst.pagedesigner.commands.single.RemoveSubNodeCommand;
-import org.eclipse.jst.pagedesigner.properties.BaseCustomSection;
-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.Label;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class JSFHtmlOutputFormatParamsSection extends BaseCustomSection
-{
- private Table _paramTable;
- private TableViewer _paramViewer;
- private Button _paramAddButton, _paramRemoveButton;
-
- private String[] _columnNames =
- {
- "name", "value" //$NON-NLS-1$ //$NON-NLS-2$
- }
- ;
-
- private class ParamCotentLabelProvider implements IStructuredContentProvider, ITableLabelProvider
- {
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
- */
- public Object[] getElements(Object inputElement)
- {
- IDOMElement root = _element;
- List result = new ArrayList();
-
- NodeList children = root.getChildNodes();
- for (int i = 0, n = children.getLength(); i < n; i++)
- {
- Node child = children.item(i);
- if (child.getNodeType() == Node.ELEMENT_NODE)
- {
- IDOMElement element = (IDOMElement) child;
- String nodeName = element.getNodeName();
- if (nodeName.indexOf("param") != -1) //$NON-NLS-1$
- {
- result.add(child);
- }
- }
- }
-
- if (result.isEmpty())
- {
- return new Object[0];
- }
-
- return result.toArray(new IDOMElement[result.size()]);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
- */
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
- {
- // do nothing
- }
-
- public String getColumnText(Object element, int columnIndex)
- {
- String result = null;
- if (element instanceof IDOMElement)
- {
- IDOMElement node = (IDOMElement) element;
- switch (columnIndex)
- {
- case 0:
- result = node.getAttribute(IJSFConstants.ATTR_NAME);
- break;
- case 1:
- result = node.getAttribute(IJSFConstants.ATTR_VALUE);
- break;
- default:
- break;
- }
- }
- return result != null ? result : ""; //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IContentProvider#dispose()
- */
-
- public void dispose()
- {
- // nothing to dispose
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
- */
- public Image getColumnImage(Object element, int columnIndex)
- {
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- public void addListener(ILabelProviderListener listener)
- {
- // TODO: no support for listeners?
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)
- */
- public boolean isLabelProperty(Object element, String property)
- {
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- public void removeListener(ILabelProviderListener listener)
- {
- // TODO: no support for listeners?
- }
- }
-
- private class ParamCellModifier implements ICellModifier
- {
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ICellModifier#canModify(java.lang.Object, java.lang.String)
- */
- public boolean canModify(Object element, String property)
- {
- return true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ICellModifier#getValue(java.lang.Object, java.lang.String)
- */
- public Object getValue(Object element, String property)
- {
- int columnIndex = getColumnNames().indexOf(property);
-
- Object result = null;
- IDOMElement node = (IDOMElement) element;
- switch (columnIndex)
- {
- case 0: // Name
- result = node.getAttribute(IJSFConstants.ATTR_NAME);
- break;
- case 1: // Value
- result = node.getAttribute(IJSFConstants.ATTR_VALUE);
- break;
- default:
- result = ""; //$NON-NLS-1$
- }
- return result != null ? result : ""; //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ICellModifier#modify(java.lang.Object, java.lang.String, java.lang.Object)
- */
- public void modify(Object element, String property, Object value)
- {
- int columnIndex = getColumnNames().indexOf(property);
-
- TableItem item = (TableItem) element;
- IDOMElement node = (IDOMElement) item.getData();
- String valueString;
- ChangeAttributeCommand c;
- switch (columnIndex)
- {
- case 0: // Name
- valueString = ((String) value).trim();
- c = new ChangeAttributeCommand(SectionResources.getString("JSFHtmlOutputFormatSection.CommandLabel.ChangeAttribute"), node, IJSFConstants.ATTR_NAME, valueString); //$NON-NLS-1$
- c.execute();
- break;
- case 1: // Value
- valueString = ((String) value).trim();
- c = new ChangeAttributeCommand(SectionResources.getString("JSFHtmlOutputFormatSection.CommandLabel.ChangeAttribute"), node, IJSFConstants.ATTR_VALUE, valueString); //$NON-NLS-1$
- c.execute();
- break;
- default:
- break;
- }
- _paramViewer.setInput(_element);
- // TODO: does nothing updateParamButtonStatus();
- }
- }
-
- /**
- * Default constructor
- */
- public JSFHtmlOutputFormatParamsSection()
- {
- super();
- }
-
- public void createControls(Composite parent, TabbedPropertySheetPage aTabbedPropertySheetPage)
- {
- super.createControls(parent, aTabbedPropertySheetPage);
- TabbedPropertySheetWidgetFactory factory = aTabbedPropertySheetPage.getWidgetFactory();
- Composite top = factory.createFlatFormComposite(parent);
-
- GridLayout layout = new GridLayout();
- layout.numColumns = 4;
- top.setLayout(layout);
-
- createParamPart(factory, top);
- }
-
- /**
- * @param factory
- * @param other
- */
- private void createParamPart(TabbedPropertySheetWidgetFactory factory, Composite other)
- {
- GridData data;
-
- Label label = factory.createLabel(other, SectionResources.getString("JSFHtmlOutputFormatSection.Parameters")); //$NON-NLS-1$
- data = new GridData(GridData.FILL);
- data.horizontalSpan = 4;
- label.setLayoutData(data);
-
- _paramTable = factory.createTable(other, SWT.FULL_SELECTION | SWT.MULTI);
- data = new GridData(GridData.FILL_BOTH);
- data.horizontalSpan = 3;
- data.verticalSpan = 3;
- data.heightHint = 50;
- _paramTable.setHeaderVisible(true);
- _paramTable.setLinesVisible(true);
- _paramTable.setLayoutData(data);
-
- TableColumn column = new TableColumn(_paramTable, SWT.NONE);
- column.setText(SectionResources.getString("JSFHtmlOutputFormatSection.ColName")); //$NON-NLS-1$
- column.setWidth(100);
-
- column = new TableColumn(_paramTable, SWT.NONE);
- column.setText(SectionResources.getString("JSFHtmlOutputFormatSection.ColValue")); //$NON-NLS-1$
- column.setWidth(100);
-
- _paramViewer = new TableViewer(_paramTable);
- _paramViewer.setColumnProperties(_columnNames);
-
- CellEditor[] editors = new CellEditor[_columnNames.length];
- TextCellEditor textEditor = new TextCellEditor(_paramTable);
- editors[0] = textEditor;
- textEditor = new TextCellEditor(_paramTable);
- editors[1] = textEditor;
-
- _paramViewer.setCellEditors(editors);
- _paramViewer.setCellModifier(new ParamCellModifier());
- _paramViewer.setContentProvider(new ParamCotentLabelProvider());
- _paramViewer.setLabelProvider(new ParamCotentLabelProvider());
- _paramViewer.addDoubleClickListener(new IDoubleClickListener()
- {
- public void doubleClick(DoubleClickEvent event)
- {
- IStructuredSelection selection = (IStructuredSelection) event.getSelection();
- if (selection != null)
- {
- IDOMElement node = (IDOMElement) selection.getFirstElement();
- gotoNode(node);
- }
- }
- }
- );
- _paramViewer.addSelectionChangedListener(new ISelectionChangedListener()
- {
- public void selectionChanged(SelectionChangedEvent event)
- {
-// TODO: does nothing updateParamButtonStatus();
- }
- }
- );
-
- _paramAddButton = factory.createButton(other, SectionResources.getString("JSFHtmlOutputTextSection.Add"), //$NON-NLS-1$
- SWT.NONE);
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- _paramAddButton.setLayoutData(data);
- _paramAddButton.addSelectionListener(new SelectionAdapter()
- {
- public void widgetSelected(SelectionEvent e)
- {
- Map attributes = new HashMap();
- attributes.put(IJSFConstants.ATTR_NAME, "name"); //$NON-NLS-1$
- attributes.put(IJSFConstants.ATTR_VALUE, "value"); //$NON-NLS-1$
- AddSubNodeCommand c = new AddSubNodeCommand(SectionResources.getString("JSFHtmlOutputFormatSection.CommandLabel.AddSubTag"), _element, "param", //$NON-NLS-1$ //$NON-NLS-2$
- ITLDConstants.URI_JSF_CORE, attributes);
- c.execute();
- _paramViewer.refresh();
-// TODO: does nothing updateParamButtonStatus();
- }
- }
- );
- _paramRemoveButton = factory.createButton(other, SectionResources.getString("JSFHtmlOutputTextSection.Remove"), //$NON-NLS-1$
- SWT.NONE);
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- _paramRemoveButton.setLayoutData(data);
- _paramRemoveButton.addSelectionListener(new SelectionAdapter()
- {
- public void widgetSelected(SelectionEvent e)
- {
- IStructuredSelection selection = (IStructuredSelection) _paramViewer.getSelection();
- if (selection != null)
- {
- for (Iterator i = selection.iterator(); i.hasNext();)
- {
- IDOMElement node = (IDOMElement) i.next();
- RemoveSubNodeCommand c = new RemoveSubNodeCommand(SectionResources.getString("JSFHtmlOutputFormatSection.CommandLabel.RemoveSubTag"), _element, node); //$NON-NLS-1$
- c.execute();
- }
- _paramViewer.refresh();
-// TODO: does nothing updateParamButtonStatus();
- }
- }
- }
- );
- }
-
- // TODO: does nothing
-// private void updateParamButtonStatus()
-// {
-// }
-
- public void setInput(IWorkbenchPart part, ISelection selection)
- {
- super.setInput(part, selection);
-
- _paramViewer.setInput(_element);
-// TODO: does nothing updateParamButtonStatus();
- }
-
- private List getColumnNames()
- {
- return Arrays.asList(_columnNames);
- }
-
- protected void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos)
- {
- if(_paramViewer != null && !_paramViewer.getControl().isDisposed())
- {
- _paramViewer.refresh();
- }
-
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlOutputTextConverterSection.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlOutputTextConverterSection.java
deleted file mode 100644
index 718dddc..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlOutputTextConverterSection.java
+++ /dev/null
@@ -1,321 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.sections;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelection;
-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.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.commands.single.AddSubNodeCommand;
-import org.eclipse.jst.pagedesigner.commands.single.RemoveSubNodeCommand;
-import org.eclipse.jst.pagedesigner.properties.BaseCustomSection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-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.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class JSFHtmlOutputTextConverterSection extends BaseCustomSection
-{
- private Table _convertTable;
- private TableViewer _convertViewer;
- private Button _convertAddButton, _convertRemoveButton;
- private CCombo _convertTypeCombo;
- final private static String[] CONVERTTYPES =
- {
- "DateTime", "Number" //$NON-NLS-1$ //$NON-NLS-2$
- }
- ;
-
- private class ConvertCotentLabelProvider implements IStructuredContentProvider, ITableLabelProvider
- {
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
- */
- public Object[] getElements(Object inputElement)
- {
- IDOMElement root = _element;
- List result = new ArrayList();
-
- NodeList children = root.getChildNodes();
- for (int i = 0, n = children.getLength(); i < n; i++)
- {
- Node child = children.item(i);
- if (child.getNodeType() == Node.ELEMENT_NODE)
- {
- IDOMElement element = (IDOMElement) child;
- String nodeName = element.getNodeName();
- if (nodeName.indexOf("convert") != -1) //$NON-NLS-1$
- {
- result.add(child);
- }
- }
- }
-
- if (result.isEmpty())
- {
- return new Object[0];
- }
-
- return result.toArray(new IDOMElement[result.size()]);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
- */
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
- {
- // do nothing
- }
-
- public String getColumnText(Object element, int columnIndex)
- {
- String result = null;
- if (element instanceof IDOMElement)
- {
- IDOMElement node = (IDOMElement) element;
- String nodeName = node.getNodeName();
- switch (columnIndex)
- {
- case 0:
- result = nodeName;
- break;
- default:
- break;
- }
- }
- return result != null ? result : ""; //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IContentProvider#dispose()
- */
-
- public void dispose()
- {
- // nothing to dispose
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
- */
- public Image getColumnImage(Object element, int columnIndex)
- {
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- public void addListener(ILabelProviderListener listener)
- {
- // TODO: no support for listeners?
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)
- */
- public boolean isLabelProperty(Object element, String property)
- {
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- public void removeListener(ILabelProviderListener listener)
- {
- // TODO: no support for listeners?
- }
-
- }
-
- /**
- * Default constructor
- */
- public JSFHtmlOutputTextConverterSection()
- {
- super();
- }
-
- public void createControls(Composite parent, TabbedPropertySheetPage aTabbedPropertySheetPage)
- {
- super.createControls(parent, aTabbedPropertySheetPage);
- TabbedPropertySheetWidgetFactory factory = aTabbedPropertySheetPage.getWidgetFactory();
- Composite top = factory.createFlatFormComposite(parent);
-
- GridLayout layout = new GridLayout();
- layout.numColumns = 4;
- top.setLayout(layout);
-
- createConvertPart(factory, top);
- }
-
- /**
- * @param factory
- * @param other
- */
- private void createConvertPart(TabbedPropertySheetWidgetFactory factory, Composite other)
- {
- GridData data;
- _convertTable = factory.createTable(other, SWT.FULL_SELECTION | SWT.MULTI);
- data = new GridData(GridData.FILL_BOTH);
- data.horizontalSpan = 3;
- data.verticalSpan = 3;
- _convertTable.setHeaderVisible(true);
- _convertTable.setLayoutData(data);
- _convertTable.setLinesVisible(true);
-
- TableColumn convertColumn = new TableColumn(_convertTable, SWT.NONE);
- convertColumn.setText(SectionResources.getString("JSFHtmlOutputTextSection.Converter")); //$NON-NLS-1$
- convertColumn.setWidth(100);
-
- _convertViewer = new TableViewer(_convertTable);
- _convertViewer.setContentProvider(new ConvertCotentLabelProvider());
- _convertViewer.setLabelProvider(new ConvertCotentLabelProvider());
- _convertViewer.addDoubleClickListener(new IDoubleClickListener()
- {
- public void doubleClick(DoubleClickEvent event)
- {
- IStructuredSelection selection = (IStructuredSelection) event.getSelection();
- if (selection != null)
- {
- IDOMElement node = (IDOMElement) selection.getFirstElement();
- gotoNode(node);
- }
- }
- }
- );
- _convertViewer.addSelectionChangedListener(new ISelectionChangedListener()
- {
- public void selectionChanged(SelectionChangedEvent event)
- {
- updateConvertButtonStatus();
- }
- }
- );
-
- _convertTypeCombo = factory.createCCombo(other, SWT.READ_ONLY);
- _convertTypeCombo.setItems(CONVERTTYPES);
- _convertTypeCombo.select(0);
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- _convertTypeCombo.setLayoutData(data);
-
- _convertAddButton = factory.createButton(other, SectionResources.getString("JSFHtmlOutputTextSection.Add"), //$NON-NLS-1$
- SWT.NONE);
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- _convertAddButton.setLayoutData(data);
- _convertAddButton.addSelectionListener(new SelectionAdapter()
- {
- public void widgetSelected(SelectionEvent e)
- {
- Map attributes = new HashMap();
- AddSubNodeCommand c = new AddSubNodeCommand(SectionResources.getString("JSFHtmlOutputTextSection.CommandLabel.AddSubTag"), _element, "convert" //$NON-NLS-1$ //$NON-NLS-2$
- + _convertTypeCombo.getText(), ITLDConstants.URI_JSF_CORE, attributes);
- c.execute();
- _convertViewer.refresh();
- updateConvertButtonStatus();
- }
- }
- );
- _convertRemoveButton = factory.createButton(other, SectionResources
- .getString("JSFHtmlOutputTextSection.Remove"), SWT.NONE); //$NON-NLS-1$
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- _convertRemoveButton.setLayoutData(data);
- _convertRemoveButton.addSelectionListener(new SelectionAdapter()
- {
- public void widgetSelected(SelectionEvent e)
- {
- IStructuredSelection selection = (IStructuredSelection) _convertViewer.getSelection();
- if (selection != null)
- {
- for (Iterator i = selection.iterator(); i.hasNext();)
- {
- IDOMElement node = (IDOMElement) i.next();
- RemoveSubNodeCommand c = new RemoveSubNodeCommand(SectionResources.getString("JSFHtmlOutputTextSection.CommandLabel.RemoveSubTag"), _element, node); //$NON-NLS-1$
- c.execute();
- }
- _convertViewer.refresh();
- updateConvertButtonStatus();
- }
- }
- }
- );
- }
-
- private void updateConvertButtonStatus()
- {
- _convertAddButton.setEnabled(true);
- _convertRemoveButton.setEnabled(true);
- ISelection selection = _convertViewer.getSelection();
- if (selection == null || selection.isEmpty())
- {
- _convertRemoveButton.setEnabled(false);
- }
- if (_convertTable.getItemCount() == 0)
- {
- _convertRemoveButton.setEnabled(false);
- }
- if (_convertTable.getItemCount() > 0)
- {
- _convertAddButton.setEnabled(false);
- }
- }
-
- public void setInput(IWorkbenchPart part, ISelection selection)
- {
- super.setInput(part, selection);
-
- _convertViewer.setInput(_element);
- updateConvertButtonStatus();
- }
-
- protected void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos)
- {
- if(_convertViewer != null && !_convertViewer.getControl().isDisposed())
- {
- _convertViewer.refresh();
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlSelectChoicesSection.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlSelectChoicesSection.java
deleted file mode 100644
index 7f2be0e..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlSelectChoicesSection.java
+++ /dev/null
@@ -1,457 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.sections;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.ICellModifier;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelection;
-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.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.commands.single.AddSubNodeCommand;
-import org.eclipse.jst.pagedesigner.commands.single.ChangeAttributeCommand;
-import org.eclipse.jst.pagedesigner.commands.single.InsertSubNodeCommand;
-import org.eclipse.jst.pagedesigner.commands.single.RemoveSubNodeCommand;
-import org.eclipse.jst.pagedesigner.properties.BaseCustomSection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-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.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class JSFHtmlSelectChoicesSection extends BaseCustomSection
-{
- final private static String[] CHOICETYPES = { IJSFConstants.TAG_SELECTITEM, IJSFConstants.TAG_SELECTITEMS};
- private Table _choiceTable;
- private TableViewer _choiceViewer;
- private CCombo _choiceTypeCombo;
- private Button _choiceAddButton, _choiceRemoveButton, _choiceMoveUpButton, _choiceMoveDownButton;
- private static final String[] COLUMN_NAMES = new String[] {"choices","itemLabel", "itemValue", "id"};
-
- private class ChoiceCotentLabelProvider implements IStructuredContentProvider, ITableLabelProvider
- {
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
- */
- public Object[] getElements(final Object inputElement)
- {
- final IDOMElement root = _element;
- final List result = new ArrayList();
-
- final NodeList children = root.getChildNodes();
- for (int i = 0, n = children.getLength(); i < n; i++)
- {
- final Node child = children.item(i);
- if (child.getNodeType() == Node.ELEMENT_NODE)
- {
- final IDOMElement element = (IDOMElement) child;
- final String nodeName = element.getNodeName();
- if (nodeName.indexOf("select") != -1) //$NON-NLS-1$
- {
- result.add(child);
- }
- }
- }
-
- if (result.isEmpty())
- {
- return new Object[0];
- }
-
- return result.toArray(new IDOMElement[result.size()]);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
- */
- public void inputChanged(final Viewer viewer, final Object oldInput, final Object newInput)
- {
- // do nothing
- }
-
- public String getColumnText(final Object element, final int columnIndex)
- {
- String result = null;
- if (element instanceof Node)
- {
- final Node node = (Node) element;
- Node attrNode = null;
- String attrName = null;
- if (columnIndex == 1)
- {
- attrName = "itemLabel";
- }
- else if (columnIndex == 2)
- {
- attrName = "itemValue";
- }
- else if (columnIndex == 3)
- {
- attrName = "id";
- }
-
- switch (columnIndex)
- {
- case 0:
- result = node.getNodeName();
- break;
- default:
- {
- attrNode = node.getAttributes().getNamedItem(attrName);
- if (attrNode != null)
- {
- result = attrNode.getNodeValue()!=null ? attrNode.getNodeValue() : " - ";
- }
- else
- {
- result = " - ";
- }
- }
- }
- }
- return result != null ? result : ""; //$NON-NLS-1$
- }
-
- public void dispose()
- {
- // do nothing
- }
-
- public Image getColumnImage(final Object element, final int columnIndex)
- {
- return null;
- }
-
- public void addListener(final ILabelProviderListener listener)
- {
- // TODO: no support for listeners?
- }
-
- public boolean isLabelProperty(final Object element, final String property)
- {
- return false;
- }
-
- public void removeListener(final ILabelProviderListener listener)
- {
- // TODO: no support for listeners?
- }
- }
-
- /**
- * Default constructor
- */
- public JSFHtmlSelectChoicesSection()
- {
- super();
- }
-
- @Override
- public void createControls(final Composite parent, final TabbedPropertySheetPage aTabbedPropertySheetPage)
- {
- super.createControls(parent, aTabbedPropertySheetPage);
- final TabbedPropertySheetWidgetFactory factory = aTabbedPropertySheetPage.getWidgetFactory();
- final Composite top = factory.createFlatFormComposite(parent);
-
- final GridLayout layout = new GridLayout();
- layout.numColumns = 4;
- top.setLayout(layout);
-
- createChoicePart(factory, top);
- }
-
- /**
- * @param factory
- * @param other
- */
- private void createChoicePart(final TabbedPropertySheetWidgetFactory factory, final Composite other)
- {
- GridData data;
- _choiceTable = factory.createTable(other, SWT.FULL_SELECTION | SWT.MULTI);
- data = new GridData(GridData.FILL_BOTH);
- data.horizontalSpan = 3;
- data.verticalSpan = 5;
- data.heightHint = 50;
- _choiceTable.setHeaderVisible(true);
- _choiceTable.setLayoutData(data);
- _choiceTable.setLinesVisible(true);
-
- final TableColumn choiceColumn = new TableColumn(_choiceTable, SWT.NONE);
- choiceColumn.setText(SectionResources.getString("JSFHtmlSelectManyCheckboxSection.Choices")); //$NON-NLS-1$
- choiceColumn.setWidth(100);
-
- final TableColumn labelColumn = new TableColumn(_choiceTable, SWT.NONE);
- labelColumn.setText("itemLabel");
- labelColumn.setWidth(100);
-
- final TableColumn valueColumn = new TableColumn(_choiceTable, SWT.NONE);
- valueColumn.setText("itemValue");
- valueColumn.setWidth(100);
-
- final TableColumn idColumn = new TableColumn(_choiceTable, SWT.NONE);
- idColumn.setText("id");
- idColumn.setWidth(100);
-
- _choiceViewer = new TableViewer(_choiceTable);
- _choiceViewer.setColumnProperties(COLUMN_NAMES );
- final CellEditor[] editors = new CellEditor[4];
- TextCellEditor textEditor = new TextCellEditor(_choiceTable);
- editors[0] = textEditor;
- textEditor = new TextCellEditor(_choiceTable);
- editors[1] = textEditor;
- textEditor = new TextCellEditor(_choiceTable);
- editors[2] = textEditor;
- textEditor = new TextCellEditor(_choiceTable);
- editors[3] = textEditor;
-
- _choiceViewer.setCellEditors(editors);
- _choiceViewer.setCellModifier(new ICellModifier(){
-
- public boolean canModify(final Object element, final String property) {
- final IDOMElement node = (IDOMElement)element;
- if (node.getLocalName().equals("selectItem"))
- {
- return ! property.equals("choices");
- }
-
- return property.equals("id");
- }
-
- public Object getValue(final Object element, final String property) {
- final IDOMElement node = (IDOMElement) element;
- final String val = node.getAttribute(property) != null ? node.getAttribute(property) : "";
- return val;
- }
-
- public void modify(final Object element, final String property, final Object value) {
-
- final TableItem item = (TableItem) element;
- final IDOMElement node = (IDOMElement) item.getData();
- String valueString;
- ChangeAttributeCommand c;
-
- valueString = ((String) value).trim();
- c = new ChangeAttributeCommand(
- SectionResources.getString("JSFHtmlInputTextSection.CommandLabel.ChangeAttribute"), node, property, valueString); //$NON-NLS-1$
- c.execute();
-
- _choiceViewer.refresh();
- }
-
- });
- _choiceViewer.setContentProvider(new ChoiceCotentLabelProvider());
- _choiceViewer.setLabelProvider(new ChoiceCotentLabelProvider());
- _choiceViewer.addDoubleClickListener(new IDoubleClickListener()
- {
- public void doubleClick(final DoubleClickEvent event)
- {
- final IStructuredSelection selection = (IStructuredSelection) event.getSelection();
- if (selection != null)
- {
- final IDOMElement node = (IDOMElement) selection.getFirstElement();
- gotoNode(node);
- }
- }
- });
- _choiceViewer.addSelectionChangedListener(new ISelectionChangedListener()
- {
- public void selectionChanged(final SelectionChangedEvent event)
- {
- updateChoiceButtonStatus();
- }
- });
-
- _choiceTypeCombo = factory.createCCombo(other, SWT.READ_ONLY);
- _choiceTypeCombo.setItems(CHOICETYPES);
- _choiceTypeCombo.select(0);
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- _choiceTypeCombo.setLayoutData(data);
-
- _choiceAddButton = factory.createButton(other, SectionResources
- .getString("JSFHtmlSelectManyCheckboxSection.Add"), SWT.NONE); //$NON-NLS-1$
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- _choiceAddButton.setLayoutData(data);
- _choiceAddButton.addSelectionListener(new SelectionAdapter()
- {
- @Override
- public void widgetSelected(final SelectionEvent e)
- {
- final Map attributes = new HashMap();
- final AddSubNodeCommand c = new AddSubNodeCommand(
- SectionResources.getString("JSFHtmlSelectManyCheckboxSection.CommandLabel.AddSubTag"), _element, _choiceTypeCombo.getText(), //$NON-NLS-1$
- ITLDConstants.URI_JSF_CORE, attributes);
- c.execute();
- _choiceViewer.refresh();
- updateChoiceButtonStatus();
- }
- });
- _choiceRemoveButton = factory.createButton(other, SectionResources
- .getString("JSFHtmlSelectManyCheckboxSection.Remove"), SWT.NONE); //$NON-NLS-1$
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- _choiceRemoveButton.setLayoutData(data);
- _choiceRemoveButton.addSelectionListener(new SelectionAdapter()
- {
- @Override
- public void widgetSelected(final SelectionEvent e)
- {
- final IStructuredSelection selection = (IStructuredSelection) _choiceViewer.getSelection();
- if (selection != null)
- {
- for (final Iterator i = selection.iterator(); i.hasNext();)
- {
- final IDOMElement node = (IDOMElement) i.next();
- final RemoveSubNodeCommand c = new RemoveSubNodeCommand(
- SectionResources
- .getString("JSFHtmlSelectManyCheckboxSection.CommandLabel.RemoveSubTag"), _element, node); //$NON-NLS-1$
- c.execute();
- }
- _choiceViewer.refresh();
- updateChoiceButtonStatus();
- }
- }
- });
- _choiceMoveUpButton = factory.createButton(other, SectionResources
- .getString("JSFHtmlSelectManyCheckboxSection.MoveUp"), SWT.NONE); //$NON-NLS-1$
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- _choiceMoveUpButton.setLayoutData(data);
- _choiceMoveUpButton.addSelectionListener(new SelectionAdapter()
- {
- @Override
- public void widgetSelected(final SelectionEvent e)
- {
- final int index = _choiceTable.getSelectionIndex();
- final IDOMElement child = (IDOMElement) _choiceTable.getItem(index).getData();
- final IDOMElement refchild = (IDOMElement) _choiceTable.getItem(index - 1).getData();
- final RemoveSubNodeCommand remove = new RemoveSubNodeCommand(SectionResources
- .getString("JSFHtmlSelectManyCheckboxSection.CommandLabel.RemoveSubTag"), _element, child); //$NON-NLS-1$
- remove.execute();
- final InsertSubNodeCommand insert = new InsertSubNodeCommand(
- SectionResources.getString("JSFHtmlSelectManyCheckboxSection.CommandLabel.InsertSubTag"), _element, child, refchild); //$NON-NLS-1$
- insert.execute();
- _choiceViewer.refresh();
- _choiceViewer.getTable().select(index - 1);
- updateChoiceButtonStatus();
- }
- });
- _choiceMoveDownButton = factory.createButton(other, SectionResources
- .getString("JSFHtmlSelectManyCheckboxSection.MoveDown"), SWT.NONE); //$NON-NLS-1$
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- _choiceMoveDownButton.setLayoutData(data);
- _choiceMoveDownButton.addSelectionListener(new SelectionAdapter()
- {
- @Override
- public void widgetSelected(final SelectionEvent e)
- {
- final int index = _choiceTable.getSelectionIndex();
- final IDOMElement child = (IDOMElement) _choiceTable.getItem(index).getData();
- final IDOMElement refchild = (IDOMElement) _choiceTable.getItem(index + 1).getData();
- final RemoveSubNodeCommand remove = new RemoveSubNodeCommand(SectionResources
- .getString("JSFHtmlSelectManyCheckboxSection.CommandLabel.RemoveSubTag"), _element, refchild); //$NON-NLS-1$
- remove.execute();
- final InsertSubNodeCommand insert = new InsertSubNodeCommand(
- SectionResources.getString("JSFHtmlSelectManyCheckboxSection.CommandLabel.InsertSubTag"), _element, refchild, child); //$NON-NLS-1$
- insert.execute();
- _choiceViewer.refresh();
- _choiceViewer.getTable().select(index + 1);
- updateChoiceButtonStatus();
- }
- });
- }
-
- private void updateChoiceButtonStatus()
- {
- _choiceRemoveButton.setEnabled(true);
- _choiceMoveUpButton.setEnabled(true);
- _choiceMoveDownButton.setEnabled(true);
- final ISelection selection = _choiceViewer.getSelection();
- if (selection.isEmpty())
- {
- _choiceRemoveButton.setEnabled(false);
- _choiceMoveUpButton.setEnabled(false);
- _choiceMoveDownButton.setEnabled(false);
- }
- if (_choiceTable.getItemCount() == 0)
- {
- _choiceRemoveButton.setEnabled(false);
- _choiceMoveUpButton.setEnabled(false);
- _choiceMoveDownButton.setEnabled(false);
- }
- if (_choiceTable.getSelectionCount() > 1)
- {
- _choiceMoveUpButton.setEnabled(false);
- _choiceMoveDownButton.setEnabled(false);
- }
- if (_choiceTable.getSelectionIndex() == 0)
- {
- _choiceMoveUpButton.setEnabled(false);
- }
- if (_choiceTable.getSelectionIndex() == _choiceTable.getItemCount() - 1)
- {
- _choiceMoveDownButton.setEnabled(false);
- }
- }
-
- @Override
- public void setInput(final IWorkbenchPart part, final ISelection selection)
- {
- super.setInput(part, selection);
-
- _choiceViewer.setInput(_element);
- updateChoiceButtonStatus();
- }
-
- @Override
- protected void notifyChanged(final INodeNotifier notifier, final int eventType, final Object changedFeature, final Object oldValue,
- final Object newValue, final int pos)
- {
- if (_choiceViewer != null && !_choiceViewer.getControl().isDisposed())
- {
- _choiceViewer.refresh();
- }
-
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/SectionResources.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/SectionResources.java
deleted file mode 100644
index c4b2b82..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/SectionResources.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.sections;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- * Section resources
- * @author mengbo
- * @version 1.5
- */
-public final class SectionResources
-{
- private static final String BUNDLE_NAME = "org.eclipse.jst.pagedesigner.jsf.ui.sections.SectionResources"; //$NON-NLS-1$
-
- private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
- private SectionResources()
- {
- // no external instantiation
- }
-
- /**
- * @param key
- * @return the resource for key or !key! if not found
- */
- public static String getString(String key)
- {
- try
- {
- return RESOURCE_BUNDLE.getString(key);
- }
- catch (MissingResourceException e)
- {
- return '!' + key + '!';
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/SectionResources.properties b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/SectionResources.properties
deleted file mode 100644
index 895d778..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/SectionResources.properties
+++ /dev/null
@@ -1,78 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2006 Oracle 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:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-# <f:convertDateTime>
-JSFCoreConvertDateTimeSection.ChangeAttribute=Change Attribute
-
-# <f:convertNumber>
-JSFCoreConvertNumberSection.CommandLabel.ChangeAttribute=Change Attribute
-
-# <h:commandButton>
-JSFHtmlCommandButtonSection.Listeners=Listeners
-JSFHtmlCommandButtonSection.Add=&Add
-JSFHtmlCommandButtonSection.Remove=&Remove
-JSFHtmlCommandButtonSection.CommandLabel.AddSubTag=Add Sub Tag
-JSFHtmlCommandButtonSection.CommandLabel.RemoveSubTag=Remove Sub Tag
-
-# <h:dataTable>
-JSFHtmlDataTableSection.Columns=Columns
-JSFHtmlDataTableSection.Add=&Add
-JSFHtmlDataTableSection.Remove=&Remove
-JSFHtmlDataTableSection.MoveUp=Move &up
-JSFHtmlDataTableSection.MoveDown=Move &down
-JSFHtmlDataTableSection.CommandLabel.AddSubTag=Add Sub Tag
-JSFHtmlDataTableSection.CommandLabel.RemoveSubTag=Remove Sub Tag
-JSFHtmlDataTableSection.CommandLabel.InsertSubTag=Insert Sub Tag
-
-# <h:inputHidden>
-JSFHtmlInputHiddenSection.Type=Type:
-JSFHtmlInputHiddenSection.Type0=Hidden
-JSFHtmlInputHiddenSection.Type1=Secret
-JSFHtmlInputHiddenSection.Type2=Text
-JSFHtmlInputHiddenSection.Type3=Textarea
-
-JSFHtmlInputHidden.CommandLabel.ChangeType=Change Type
-
-# <h:inputText>
-JSFHtmlInputTextSection.Validators=Validators
-JSFHtmlInputTextSection.Listeners=Listeners
-JSFHtmlInputTextSection.Minimum=Minimum
-JSFHtmlInputTextSection.Maximum=Maximum
-JSFHtmlInputTextSection.Add=&Add
-JSFHtmlInputTextSection.Remove=&Remove
-JSFHtmlInputTextSection.Converter=Converter
-JSFHtmlInputTextSection.CommandLabel.ChangeAttribute=Change Attribute
-JSFHtmlInputTextSection.CommandLabel.AddSubTag=Add Sub Tag
-JSFHtmlInputTextSection.CommandLabel.RemoveSubTag=Remove Sub Tag
-
-# <h:outputFormat>
-JSFHtmlOutputFormatSection.Parameters=Parameters:
-JSFHtmlOutputFormatSection.ColName=Name
-JSFHtmlOutputFormatSection.ColValue=Value
-JSFHtmlOutputFormatSection.CommandLabel.ChangeAttribute=Change Attribute
-JSFHtmlOutputFormatSection.CommandLabel.AddSubTag=Add Sub Tag
-JSFHtmlOutputFormatSection.CommandLabel.RemoveSubTag=Remove Sub Tag
-
-# <h:outputText>
-JSFHtmlOutputTextSection.Converter=Converter
-JSFHtmlOutputTextSection.Add=&Add
-JSFHtmlOutputTextSection.Remove=&Remove
-JSFHtmlOutputTextSection.CommandLabel.AddSubTag=Add Sub Tag
-JSFHtmlOutputTextSection.CommandLabel.RemoveSubTag=Remove Sub Tag
-
-# <h:selectManyCheckbox>
-JSFHtmlSelectManyCheckboxSection.Choices=Choices
-JSFHtmlSelectManyCheckboxSection.Add=&Add
-JSFHtmlSelectManyCheckboxSection.Remove=&Remove
-JSFHtmlSelectManyCheckboxSection.MoveUp=Move &up
-JSFHtmlSelectManyCheckboxSection.MoveDown=Move &down
-JSFHtmlSelectManyCheckboxSection.CommandLabel.AddSubTag=Add Sub Tag
-JSFHtmlSelectManyCheckboxSection.CommandLabel.RemoveSubTag=Remove Sub Tag
-JSFHtmlSelectManyCheckboxSection.CommandLabel.InsertSubTag=Insert Sub Tag
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/util/JSFUIPluginResourcesUtil.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/util/JSFUIPluginResourcesUtil.java
deleted file mode 100644
index 82906ce..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/util/JSFUIPluginResourcesUtil.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.util;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.jst.jsf.common.ui.JSFUICommonPlugin;
-import org.eclipse.jst.jsf.common.ui.internal.logging.Logger;
-import org.eclipse.jst.jsf.common.ui.internal.utils.ResourceUtils;
-
-/**
- * @author mengbo
- */
-public class JSFUIPluginResourcesUtil extends ResourceUtils
-{
- private final static String bundleName = "org.eclipse.jst.pagedesigner.jsf.ui.JSFUIResources";
- private static Logger _log = JSFUICommonPlugin.getLogger(JSFUIPluginResourcesUtil.class);
- private static JSFUIPluginResourcesUtil _resource; // singleton
-
- private JSFUIPluginResourcesUtil()
- {
- try
- {
- _resources = ResourceBundle.getBundle(bundleName);
- }
- catch (MissingResourceException e)
- {
- _log.error("Error in getting show messages resource bundle file", e);
- }
- }
-
- /**
- * @return the singleton instance
- */
- public static JSFUIPluginResourcesUtil getInstance()
- {
- if (_resource == null)
- {
- _resource = new JSFUIPluginResourcesUtil();
- }
- return _resource;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/.classpath b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/.cvsignore b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/.cvsignore
deleted file mode 100644
index f9eb27a..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-build.xml
-@dot
-javaCompiler...args
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/.project b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/.project
deleted file mode 100644
index 9685725..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.pagedesigner.jsp.core</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/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/.settings/org.eclipse.core.resources.prefs b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 1c9084e..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun May 27 16:05:25 EDT 2007
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/.settings/org.eclipse.jdt.core.prefs b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2f9ad38..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,77 +0,0 @@
-#Tue Apr 10 11:11:41 PDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-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.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-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=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-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=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=error
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-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.5
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/.settings/org.eclipse.jdt.ui.prefs b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 82eb6c1..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Apr 06 18:25:15 PDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/>
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/META-INF/MANIFEST.MF b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/META-INF/MANIFEST.MF
deleted file mode 100644
index ea07686..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,27 +0,0 @@
-Manifest-Version: 1.0
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.pagedesigner.jsp.core;singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Bundle-ClassPath: .
-Bundle-Activator: org.eclipse.jst.pagedesigner.jsp.core.JSPCorePlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.sse.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.xml.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.jsp.core;bundle-version="[1.1.0,1.3.0)",
- org.eclipse.wst.html.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.jsf.common;bundle-version="[1.0.0,1.1.0)",
- javax.servlet;bundle-version="[2.4.0,3.0.0)",
- javax.servlet.jsp;bundle-version="[2.0.0,3.0.0)",
- org.apache.commons.el;bundle-version="[1.0.0,2.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-ManifestVersion: 2
-Export-Package: org.eclipse.jst.pagedesigner.jsp.core;x-internal:=true,
- org.eclipse.jst.pagedesigner.jsp.core.el;x-internal:=true,
- org.eclipse.jst.pagedesigner.jsp.core.internal.pagevar;x-internal:=true,
- org.eclipse.jst.pagedesigner.jsp.core.pagevar;x-internal:=true,
- org.eclipse.jst.pagedesigner.jsp.core.pagevar.adapter;x-internal:=true,
- org.eclipse.jst.pagedesigner.jsp.core.util;x-internal:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/about.html b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/about.html
deleted file mode 100644
index 72f94ad..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 06, 2007</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/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</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.</p>
-
-</body>
-</html>
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/build.properties b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/build.properties
deleted file mode 100644
index f912bf1..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/build.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2007 Oracle 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:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = plugin.xml,\
- META-INF/,\
- .,\
- schema/,\
- about.html,\
- plugin.properties\
-javacSource=1.5
-javacTarget=1.5
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/plugin.properties b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/plugin.properties
deleted file mode 100644
index 249602c..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/plugin.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2006 Oracle 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:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-####################################################
-# Plugin XML information.
-####################################################
-pluginName=JavaServer Faces Tools - JSP Core Pagedesigner
-providerName=Eclipse.org
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/plugin.xml b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/plugin.xml
deleted file mode 100644
index 57f4510..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/plugin.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
- <extension-point id="pageVar" name="page variable" schema="schema/pageVar.exsd"/>
-</plugin>
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/schema/pageVar.exsd b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/schema/pageVar.exsd
deleted file mode 100644
index 962bf34..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/schema/pageVar.exsd
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.pagedesigner.jsp.core">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.pagedesigner.jsp.core" id="pageVar" name="page variable"/>
- </appInfo>
- <documentation>
- [Enter description of this extension point.]
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="taglib" minOccurs="0" maxOccurs="unbounded"/>
- </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>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="tag">
- <complexType>
- <attribute name="varName" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="varTypeMode" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- <simpleType>
- <restriction base="string">
- <enumeration value="CLASSNAME">
- </enumeration>
- <enumeration value="EXPRESSION">
- </enumeration>
- <enumeration value="EXPRESSION_COLLECTION_ITEM">
- </enumeration>
- <enumeration value="BUNDLE">
- </enumeration>
- </restriction>
- </simpleType>
- </attribute>
- <attribute name="varTypeString" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="varNameIsAttr" type="boolean" use="default" value="true">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="varTypeStringIsAttr" type="boolean" use="default" value="true">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="tagName" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="taglib">
- <complexType>
- <sequence>
- <element ref="tag" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="uri" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- [Enter the first release in which this extension point appears.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- [Enter extension point usage example here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- [Enter API information here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- [Enter information about supplied implementation of this extension point.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- /*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
- </documentation>
- </annotation>
-
-</schema>
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/IJSPCoreConstants.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/IJSPCoreConstants.java
deleted file mode 100644
index 0a7f053..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/IJSPCoreConstants.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsp.core;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public interface IJSPCoreConstants
-{
- /**
- * JSP tag name
- */
- final static public String TAG_ATTRIBUTE = "attribute";
-
- /**
- * JSP tag name
- */
- final static public String TAG_BODY = "body";
-
- /**
- * JSP tag name
- */
- final static public String TAG_ELEMENT = "element";
-
- /**
- * JSP tag name
- */
- final static public String TAG_EXPRESSION = "expression";
-
- /**
- * JSP tag name
- */
- final static public String TAG_DECLARATION = "declaration";
-
- /**
- * JSP tag name
- */
- final static public String TAG_DIRECTIVE_INCLUDE = "directive.include";
-
- /**
- * JSP tag name
- */
- final static public String TAG_DIRECTIVE_PAGE = "directive.page";
-
- /**
- * JSP tag name
- */
- final static public String TAG_DIRECTIVE_TAGLIB = "directive.taglib";
-
- /**
- * JSP tag name
- */
- final static public String TAG_DOBODY = "doBody";
-
- /**
- * JSP tag name
- */
- final static public String TAG_FORWARD = "forward";
-
- /**
- * JSP tag name
- */
- final static public String TAG_GETPROPERTY = "getProperty";
-
- /**
- * JSP tag name
- */
- final static public String TAG_INCLUDE = "include";
-
- /**
- * JSP tag name
- */
- final static public String TAG_INVOKE = "invoke";
-
- /**
- * JSP tag name
- */
- final static public String TAG_OUTPUT = "output";
-
- /**
- * JSP tag name
- */
- final static public String TAG_PLUGIN = "plugin";
-
- /**
- * JSP tag name
- */
- final static public String TAG_ROOT = "root";
-
- /**
- * JSP tag name
- */
- final static public String TAG_SCRIPTLET = "scriptlet";
-
- /**
- * JSP tag name
- */
- final static public String TAG_SETPROPERTY = "setProperty";
-
- /**
- * JSP tag name
- */
- final static public String TAG_TEXT = "text";
-
- /**
- * JSP tag name
- */
- final static public String TAG_USEBEAN = "useBean";
-
- /**
- * JSP tag name
- */
- final static public String TAG_LEADING_DIRECTIVE = "directive.";
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_ALIGN = "align";
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_ARCHIVE = "archive";
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_BEANNAME = "beanName";
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_CLASS = "class";
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_CODE = "code";
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_CODEBASE = "codebase";
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_DOCTYPEROOTELEMENT = "doctype-root-element";
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_DOCTYPESYSTEM = "doctype-system";
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_DOCTYPEPUBLIC = "doctype-public";
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_FILE = "file";
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_FRAGMENT = "fragment";
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_HEIGHT = "height";
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_HSPACE = "hspace";
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_ID = "id";
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_IEPLUGINURL = "iepluginurl";
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_JREVERSION = "jreversion";
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_NAME = "name";
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_NSPLUGINURL = "nspluginurl";
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_OMITXMLDECLARATION = "omit-xml-declaration";
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_PAGE = "page";
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_PROPERTY = "property";
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_SCOPE = "scope";
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_TRIM = "trim";
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_TYPE = "type";
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_URI = "uri";
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_VALUE = "value";
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_VAR = "var";
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_VARREADER = "varReader";
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_VERSION = "version";
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_XMLNSJSP = "xmlns:jsp";
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_XMLNSTAGLIBPREFIX = "xmlns:taglibPrefix";
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/JSPCorePlugin.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/JSPCorePlugin.java
deleted file mode 100644
index c31be11..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/JSPCorePlugin.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsp.core;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class JSPCorePlugin extends Plugin {
- // The shared instance.
- private static JSPCorePlugin plugin;
-
- // Resource bundle.
- private ResourceBundle resourceBundle;
-
- /**
- * The constructor.
- */
- public JSPCorePlugin() {
- super();
- plugin = this;
- try {
- resourceBundle = ResourceBundle
- .getBundle("org.eclipse.jst.pagedesigner.jsp.core.JSPCorePluginResources");
- } catch (MissingResourceException x) {
- resourceBundle = null;
- }
- }
-
- /**
- * This method is called upon plug-in activation
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- }
-
- /**
- * This method is called when the plug-in is stopped
- */
- public void stop(BundleContext context) throws Exception {
- super.stop(context);
- }
-
- /**
- * Returns the shared instance.
- * @return the default plugin instance
- */
- public static JSPCorePlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns the string from the plugin's resource bundle, or 'key' if not
- * found.
- * @param key
- * @return the string for key or 'key' if not found in the default resource bundle
- */
- public static String getResourceString(String key) {
- ResourceBundle bundle = JSPCorePlugin.getDefault().getResourceBundle();
- try {
- return (bundle != null) ? bundle.getString(key) : key;
- } catch (MissingResourceException e) {
- return key;
- }
- }
-
- /**
- * Returns the plugin's resource bundle,
- * @return the resource bundle
- */
- public ResourceBundle getResourceBundle() {
- return resourceBundle;
- }
-
- /**
- * @return the plugin id
- */
- public static String getPluginId() {
- return getDefault().getBundle().getSymbolicName();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/ListenerList.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/ListenerList.java
deleted file mode 100644
index 9596f97..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/ListenerList.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsp.core;
-
-/**
- * Local version of org.eclipse.jface.util.ListenerList (modified)
- * @author mengbo
- * @version 1.5
- */
-public class ListenerList {
- /**
- * The current number of listeners. Maintains invariant: 0 <= fSize <=
- * listeners.length.
- */
- private int _size;
-
- /**
- * The list of listeners. Initially <code>null</code> but initialized to
- * an array of size capacity the first time a listener is added. Maintains
- * invariant: listeners != null if and only if fSize != 0
- */
- private Object[] _listeners = null;
-
- /**
- * The empty array singleton instance, returned by getListeners() when size ==
- * 0.
- */
- private static final Object[] EmptyArray = new Object[0];
-
- /**
- * Creates a listener list with the given initial capacity.
- *
- * @param capacity
- * the number of listeners which this list can initially accept
- * without growing its internal representation; must be at least
- * 1
- */
- public ListenerList(int capacity) {
- if (capacity < 1) {
- throw new IllegalArgumentException();
- }
- _listeners = new Object[capacity];
- _size = 0;
- }
-
- /**
- * Adds a listener to the list. Has no effect if an identical listener is
- * already registered.
- *
- * @param listener
- * a listener
- */
- public synchronized void add(Object listener) {
- if (listener == null) {
- throw new IllegalArgumentException();
- }
- // check for duplicates using identity
- for (int i = 0; i < _size; ++i) {
- if (_listeners[i] == listener) {
- return;
- }
- }
- // grow array if necessary
- if (_size == _listeners.length) {
- Object[] temp = new Object[(_size * 2) + 1];
- System.arraycopy(_listeners, 0, temp, 0, _size);
- _listeners = temp;
- }
- _listeners[_size++] = listener;
- }
-
- /**
- * Returns an array containing all the registered listeners. The resulting
- * array is unaffected by subsequent adds or removes. If there are no
- * listeners registered, the result is an empty array singleton instance (no
- * garbage is created). Use this method when notifying listeners, so that
- * any modifications to the listener list during the notification will have
- * no effect on the notification itself.
- * @return the array of registered listeners
- */
- public synchronized Object[] getListeners() {
- if (_size == 0) {
- return EmptyArray;
- }
- Object[] result = new Object[_size];
- System.arraycopy(_listeners, 0, result, 0, _size);
- return result;
- }
-
- /**
- * Removes a listener from the list. Has no effect if an identical listener
- * was not already registered.
- *
- * @param listener
- * a listener
- */
- public synchronized void remove(Object listener) {
- if (listener == null) {
- throw new IllegalArgumentException();
- }
-
- for (int i = 0; i < _size; ++i) {
- if (_listeners[i] == listener) {
- if (--_size == 0) {
- _listeners = new Object[1];
- } else {
- if (i < _size) {
- _listeners[i] = _listeners[_size];
- }
- _listeners[_size] = null;
- }
- return;
- }
- }
- }
-
- /**
- * Removes all the listeners from the list.
- */
- public void removeAll() {
- _listeners = new Object[0];
- _size = 0;
- }
-
- /**
- * Returns the number of registered listeners
- *
- * @return the number of registered listeners
- */
- public int size() {
- return _size;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/el/ELParser.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/el/ELParser.java
deleted file mode 100644
index 9c3ee7f..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/el/ELParser.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsp.core.el;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.commons.el.ComplexValue;
-import org.apache.commons.el.NamedValue;
-
-/**
- *
- * @author mengbo
- * @version 1.5
- */
-public class ELParser {
- private String _jsfExpression;
-
- private List _expressionList;
-
- /**
- * @param expression
- *
- */
- public ELParser(String expression) {
- super();
- _jsfExpression = expression;
- init();
- }
-
- /**
- *
- */
- private void init() {
- Object parsedExpression = JSFELParserHelper
- .parseExpression(_jsfExpression);
-
- if (parsedExpression instanceof ComplexValue) {
- _expressionList = new ArrayList();
- _expressionList.add(((ComplexValue) parsedExpression).getPrefix());
- _expressionList.addAll(((ComplexValue) parsedExpression)
- .getSuffixes());
- } else if (parsedExpression instanceof NamedValue) {
- _expressionList = new ArrayList();
- _expressionList.add(parsedExpression);
- }
-
- }
-
- /**
- * @return the expression elements of null if none
- */
- public Object[] getElements() {
- if (_expressionList == null) {
- return null;
- }
-
- return _expressionList.toArray();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/el/JSFELParserHelper.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/el/JSFELParserHelper.java
deleted file mode 100644
index 296abe6..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/el/JSFELParserHelper.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsp.core.el;
-
-import java.io.StringReader;
-
-import org.apache.commons.el.Expression;
-import org.apache.commons.el.ExpressionString;
-import org.apache.commons.el.parser.ELParser;
-import org.apache.commons.el.parser.ParseException;
-
-/**
- * Utility class to implement support functionality to "morph" JSP EL into JSF
- * EL
- *
- * @author mengbo
- * @version 1.5
- */
-public final class JSFELParserHelper {
- /**
- * an EL left brace
- */
- public static String JSF_EL_LEFT_BRACE = "#{";
-
- /**
- * an EL right brace
- */
- public static String JSF_EL_RIGHT_BRACE = "}";
-
- private JSFELParserHelper() {
- // util class, do not instantiate
- }
-
- /**
- * Gets the parsed form of the given expression string. Returns either an
- * Expression or ExpressionString.
- * @param expressionString
- * @return the result of parsing expressionString
- */
- public static Object parseExpression(String expressionString) {
- expressionString = toJspElExpression(expressionString);
-
- ELParser parser = new ELParser(new StringReader(expressionString));
- try {
- Object expression = parser.ExpressionString();
- if (!(expression instanceof Expression)
- && !(expression instanceof ExpressionString)) {
- return null;
- }
-
- return expression;
- } catch (ParseException e) {
-
- // String msg = "Invalid expression: '" + expressionString + "'";
- // log.debug(msg, e);
- // throw new ReferenceSyntaxException(msg, e);
- }
- return null;
- }
-
- /**
- * @param expressionString
- * @return true if the expression is 'valid'
- */
- public static boolean isValidEL(String expressionString) {
- if (expressionString == null || expressionString.length() == 0) {
- return false;
- }
-
- return expressionString.startsWith(JSF_EL_LEFT_BRACE)
- && expressionString.endsWith(JSF_EL_RIGHT_BRACE);
- }
-
- /**
- * @param expressionString
- * @return expressionString with the left and right braces removed
- * or the original string if isValidEL(expression) == false
- */
- public static String trimELBrace(String expressionString) {
- if (!isValidEL(expressionString)) {
- return expressionString;
- }
- String trimedExpression = null;
-
- trimedExpression = expressionString.substring(JSF_EL_LEFT_BRACE
- .length(), expressionString.length()
- - JSF_EL_RIGHT_BRACE.length());
-
- return trimedExpression;
- }
-
- /**
- * Convert ValueBinding syntax #{ } to JSP EL syntax ${ }
- *
- * @param expressionString
- * <code>ValueBinding</code> reference expression
- *
- * @return JSP EL compatible expression
- */
- public static String toJspElExpression(String expressionString) {
- StringBuffer sb = new StringBuffer(expressionString.length());
- int remainsPos = 0;
-
- for (int posOpenBrace = expressionString.indexOf('{'); posOpenBrace >= 0; posOpenBrace = expressionString
- .indexOf('{', remainsPos)) {
- if (posOpenBrace > 0) {
- if (posOpenBrace - 1 > remainsPos)
- sb.append(expressionString.substring(remainsPos,
- posOpenBrace - 1));
-
- if (expressionString.charAt(posOpenBrace - 1) == '$') {
- sb.append("${'${'}");
- remainsPos = posOpenBrace + 1;
- continue;
- } else if (expressionString.charAt(posOpenBrace - 1) == '#') {
- // TODO: should use \\ as escape for \ always, not just when
- // before #{
- // allow use of '\' as escape symbol for #{ (for
- // compatibility with Sun's extended implementation)
- /*
- * if (isEscaped(expressionString, posOpenBrace - 1)) {
- * escapes: { for (int i = sb.length() - 1; i >= 0; i--) {
- * if (sb.charAt(i) != '\\') { sb.setLength( sb.length() -
- * (sb.length() - i) / 2); break escapes; } }
- * sb.setLength(sb.length() / 2); } sb.append("#{"); } else {
- */
- sb.append("${");
- int posCloseBrace = indexOfMatchingClosingBrace(
- expressionString, posOpenBrace);
- sb.append(expressionString.substring(posOpenBrace + 1,
- posCloseBrace + 1));
- remainsPos = posCloseBrace + 1;
- continue;
- // }
- } else {
- if (posOpenBrace > remainsPos)
- sb.append(expressionString.charAt(posOpenBrace - 1));
- }
- }
-
- // Standalone brace
- sb.append('{');
- remainsPos = posOpenBrace + 1;
- }
-
- sb.append(expressionString.substring(remainsPos));
-
- // Create a new String to shrink mem size since we are caching
- return new String(sb.toString());
- }
-
- private static int findQuote(String expressionString, int start) {
- int indexofSingleQuote = expressionString.indexOf('\'', start);
- int indexofDoubleQuote = expressionString.indexOf('"', start);
- return minIndex(indexofSingleQuote, indexofDoubleQuote);
- }
-
- /**
- * Return the index of the matching closing brace, skipping over quoted text
- *
- * @param expressionString
- * string to search
- * @param indexofOpeningBrace
- * the location of opening brace to match
- *
- * @return the index of the matching closing brace
- *
- * @throws ReferenceSyntaxException
- * if matching brace cannot be found
- */
- private static int indexOfMatchingClosingBrace(String expressionString,
- int indexofOpeningBrace) {
- int len = expressionString.length();
- int i = indexofOpeningBrace + 1;
-
- // Loop through quoted strings
- for (;;) {
- if (i >= len) {
- throw new IllegalStateException(
- "Missing closing brace. Expression: '"
- + expressionString + "'");
- }
-
- int indexofClosingBrace = expressionString.indexOf('}', i);
- i = minIndex(indexofClosingBrace, findQuote(expressionString, i));
-
- if (i < 0) {
- // No delimiter found
- throw new IllegalStateException(
- "Missing closing brace. Expression: '"
- + expressionString + "'");
- }
-
- // 1. If quoted literal, find closing quote
- if (i != indexofClosingBrace) {
- i = indexOfMatchingClosingQuote(expressionString, i) + 1;
- if (i == 0) {
- // Note: if no match, i==0 because -1 + 1 = 0
- throw new IllegalStateException(
- "Missing closing quote. Expression: '"
- + expressionString + "'");
- }
- } else {
- // Closing brace
- return i;
- }
- }
- }
-
- /**
- * Returns the index of the matching closing quote, skipping over escaped
- * quotes
- *
- * @param expressionString
- * string to scan
- * @param indexOfOpeningQuote
- * start from this position in the string
- * @return -1 if no match, the index of closing quote otherwise
- */
- private static int indexOfMatchingClosingQuote(String expressionString,
- int indexOfOpeningQuote) {
- char quote = expressionString.charAt(indexOfOpeningQuote);
- for (int i = expressionString.indexOf(quote, indexOfOpeningQuote + 1); i >= 0; i = expressionString
- .indexOf(quote, i + 1)) {
- if (!isEscaped(expressionString, i)) {
- return i;
- }
- }
-
- // No matching quote found
- return -1;
- }
-
- private static boolean isEscaped(String expressionString, int i) {
- int escapeCharCount = 0;
- while ((--i >= 0) && (expressionString.charAt(i) == '\\')) {
- escapeCharCount++;
- }
-
- return (escapeCharCount % 2) != 0;
- }
-
- /**
- * Returns the minimum index >= 0, if any
- *
- * <p>
- * Use to find the first of two characters in a string:<br>
- * <code>minIndex(s.indexOf('/'), indexOf('\'))</code>
- * </p>
- * @param a
- * @param b
- * @return the minimum index >= 0, if any
- *
- */
- public static int minIndex(int a, int b) {
- return (a < 0) ? b : (b < 0) ? a : (a < b) ? a : b;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/internal/pagevar/DocumentPageVariableAdapter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/internal/pagevar/DocumentPageVariableAdapter.java
deleted file mode 100644
index ebd93fe..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/internal/pagevar/DocumentPageVariableAdapter.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsp.core.internal.pagevar;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jst.pagedesigner.jsp.core.ListenerList;
-import org.eclipse.jst.pagedesigner.jsp.core.pagevar.IChangeListener;
-import org.eclipse.jst.pagedesigner.jsp.core.pagevar.IVariableInfo;
-import org.eclipse.jst.pagedesigner.jsp.core.pagevar.adapter.IDocumentPageVariableAdapter;
-import org.eclipse.jst.pagedesigner.jsp.core.pagevar.adapter.IPageVariableAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * This adapter will be adapted on the JSP document.
- *
- * @author mengbo
- * @version 1.5
- */
-public class DocumentPageVariableAdapter implements
- IDocumentPageVariableAdapter {
- private IDOMDocument _document;
-
- private ListenerList _changeListeners = new ListenerList(2);
-
- private List _variableInfos = new ArrayList();
-
- private boolean _readingInfo = false;
-
- /**
- * @param doc
- *
- */
- public DocumentPageVariableAdapter(IDOMDocument doc) {
- super();
- this._document = doc;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.jsp.core.pagevar.IPageVariablesProvider#getBeanInfos()
- */
- public IVariableInfo[] getBeanInfos() {
- IVariableInfo[] ret = new IVariableInfo[_variableInfos.size()];
- return (IVariableInfo[]) _variableInfos.toArray(ret);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.jsp.core.pagevar.IPageVariablesProvider#addChangeListener(org.eclipse.jst.pagedesigner.jsp.core.pagevar.IChangeListener)
- */
- public void addChangeListener(IChangeListener listener) {
- this.reReadInfo();
- _changeListeners.add(listener);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.jsp.core.pagevar.IPageVariablesProvider#removeChangeListener(org.eclipse.jst.pagedesigner.jsp.core.pagevar.IChangeListener)
- */
- public void removeChangeListener(IChangeListener listener) {
- _changeListeners.remove(listener);
- }
-
- /**
- * fire change events on all listeners
- */
- protected void fireChanged() {
- Object[] listeners = _changeListeners.getListeners();
- for (int i = 0; i < listeners.length; i++) {
- IChangeListener l = (IChangeListener) listeners[i];
- l.changed();
- }
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.sse.core.internal.provisional.INodeAdapter#isAdapterForType(java.lang.Object)
- */
- public boolean isAdapterForType(Object type) {
- return IDocumentPageVariableAdapter.class.equals(type);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.sse.core.internal.provisional.INodeAdapter#notifyChanged(org.eclipse.wst.sse.core.internal.provisional.INodeNotifier,
- * int, java.lang.Object, java.lang.Object, java.lang.Object, int)
- */
- public void notifyChanged(INodeNotifier notifier, int eventType,
- Object changedFeature, Object oldValue, Object newValue, int pos) {
- switch (eventType) {
- case INodeNotifier.STRUCTURE_CHANGED:
- case INodeNotifier.CONTENT_CHANGED:
- case INodeNotifier.CHANGE:
- refresh();
- break;
- default:
- // skip. Ignore other kinds of change.
- }
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.jsp.core.pagevar.IPageVariablesProvider#refresh()
- */
- public void refresh() {
- reReadInfo();
- }
-
- /**
- * re-read page variable info
- */
- protected void reReadInfo() {
- if (this._readingInfo) {
- return;
- }
- try {
- List oldInfo = this._variableInfos;
- this._variableInfos = new ArrayList();
- readNode(_document);
- if (!isSame(oldInfo, this._variableInfos)) {
- fireChanged();
- }
- } finally {
- this._readingInfo = false;
- }
- }
-
- /**
- * compare two variable info list.
- *
- * @param oldInfo
- * @param list
- * @return true if same.
- */
- private boolean isSame(List oldInfo, List list) {
- if (oldInfo.size() != list.size()) {
- return false;
- }
- for (int i = 0, size = oldInfo.size(); i < size; i++) {
- IVariableInfo info1 = (IVariableInfo) oldInfo.get(i);
- IVariableInfo info2 = (IVariableInfo) list.get(i);
- if (info1 == null) {
- return false;// should not happen
- }
- if (!info1.equals(info2)) {
- return false;
- }
- }
- return true;
- }
-
- /**
- * recursively read all element, and see whether they have
- * IPageVariableAdapter, and then get variable info.
- *
- * @param element
- */
- private void readNode(Node node) {
- if (node instanceof INodeNotifier && node instanceof Element) {
- Element element = (Element) node;
- Object obj = ((INodeNotifier) element)
- .getAdapterFor(IPageVariableAdapter.class);
- if (obj instanceof IPageVariableAdapter) {
- IPageVariableAdapter adapter = (IPageVariableAdapter) obj;
- if (adapter.supportMultipleVariable(element)) {
- List infos = ((IPageVariableAdapter) obj)
- .getVariableInfos(element);
- if (infos != null) {
- this._variableInfos.addAll(infos);
- }
- } else {
- // hope not doing addAll could improve some performance.
- IVariableInfo info = adapter.getVariableInfo(element);
- if (info != null) {
- this._variableInfos.add(info);
- }
- }
- }
- }
-
- NodeList childNodes = node.getChildNodes();
- if (childNodes != null) {
- for (int i = 0, length = childNodes.getLength(); i < length; i++) {
- Node childNode = childNodes.item(i);
- readNode(childNode);
- }
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/internal/pagevar/PageVariableAdapter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/internal/pagevar/PageVariableAdapter.java
deleted file mode 100644
index 40e01b5..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/internal/pagevar/PageVariableAdapter.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsp.core.internal.pagevar;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.jst.pagedesigner.jsp.core.pagevar.IVariableInfo;
-import org.eclipse.jst.pagedesigner.jsp.core.pagevar.adapter.IDocumentPageVariableAdapter;
-import org.eclipse.jst.pagedesigner.jsp.core.pagevar.adapter.IPageVariableAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-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.w3c.dom.Element;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class PageVariableAdapter implements IPageVariableAdapter {
- static final PageVariableAdapter _instance = new PageVariableAdapter();
-
- /**
- * @return the singleton instance
- */
- public static PageVariableAdapter getInstance() {
- return _instance;
- }
-
- /**
- * no external instatiation
- */
- private PageVariableAdapter() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.sse.core.internal.provisional.INodeAdapter#isAdapterForType(java.lang.Object)
- */
- public boolean isAdapterForType(Object type) {
- return IPageVariableAdapter.class.equals(type);
- }
-
- private IDocumentPageVariableAdapter getDocumentAdapter(
- INodeNotifier notifier) {
- if (notifier instanceof IDOMNode) {
- IDOMModel model = ((IDOMNode) notifier).getModel();
- if (model != null) {
- IDOMDocument document = model.getDocument();
- if (document != null) {
- return (IDocumentPageVariableAdapter) document
- .getAdapterFor(IDocumentPageVariableAdapter.class);
- }
- }
- }
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.sse.core.internal.provisional.INodeAdapter#notifyChanged(org.eclipse.wst.sse.core.internal.provisional.INodeNotifier,
- * int, java.lang.Object, java.lang.Object, java.lang.Object, int)
- */
- public void notifyChanged(INodeNotifier notifier, int eventType,
- Object changedFeature, Object oldValue, Object newValue, int pos) {
- IDocumentPageVariableAdapter docadapter = getDocumentAdapter(notifier);
-
- switch (eventType) {
- case INodeNotifier.STRUCTURE_CHANGED:
- docadapter.refresh();
- break;
- case INodeNotifier.CONTENT_CHANGED:
- case INodeNotifier.CHANGE:
- // only this node changed, only refresh if this node is page
- // variable node
- if (notifier instanceof Element
- && supportVariableInfo((Element) notifier)) {
- docadapter.refresh();
- }
- break;
- default:
- // skip. Ignore other kinds of change.
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.jsp.core.pagevar.adapter.IPageVariableAdapter#supportMultipleVariable(org.w3c.dom.Element)
- */
- public boolean supportMultipleVariable(Element element) {
- return false;
- }
-
- /**
- * @param element
- * @return
- */
- private boolean supportVariableInfo(Element element) {
- return PageVariableAdatperRegistry.getInstance().getTagVarDescriptor(
- element) != null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.jsp.core.pagevar.adapter.IPageVariableAdapter#getVariableInfo(org.w3c.dom.Element)
- */
- public IVariableInfo getVariableInfo(Element element) {
- TagVarDescriptor desc = PageVariableAdatperRegistry.getInstance()
- .getTagVarDescriptor(element);
- if (desc == null) {
- return null;
- }
- String name;
- if (desc.isVarNameIsAttr()) {
- name = element.getAttribute(desc.getVarName());
- if (name == null || name.length() == 0) {
- return null; // missing name.
- }
- } else {
- name = desc.getVarName();
- }
- String type;
- if (desc.isVarTypeStringIsAttr()) {
- type = element.getAttribute(desc.getVarTypeString());
- if (type == null || type.length() == 0) {
- return null; // missing type
- }
- } else {
- type = desc.getVarTypeString();
- }
- return new VariableInfo(name, desc.getVarTypeMode(), type);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.jsp.core.pagevar.adapter.IPageVariableAdapter#getVariableInfos(org.w3c.dom.Element)
- */
- public List getVariableInfos(Element element) {
- IVariableInfo info = getVariableInfo(element);
- if (info == null) {
- return Collections.EMPTY_LIST;
- }
- List ret = new ArrayList(1);
- ret.add(info);
- return ret;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/internal/pagevar/PageVariableAdatperRegistry.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/internal/pagevar/PageVariableAdatperRegistry.java
deleted file mode 100644
index 3226c9d..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/internal/pagevar/PageVariableAdatperRegistry.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsp.core.internal.pagevar;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.pagedesigner.jsp.core.IJSPCoreConstants;
-import org.eclipse.jst.pagedesigner.jsp.core.JSPCorePlugin;
-import org.eclipse.jst.pagedesigner.jsp.core.pagevar.IVariableInfo;
-import org.eclipse.jst.pagedesigner.jsp.core.util.CMUtil;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.w3c.dom.Element;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class PageVariableAdatperRegistry {
- /**
- * pageVar
- */
- public static final String PAGEVAR = "pageVar";
-
- /**
- * taglib
- */
- public static final String TAGLIB = "taglib";
-
- /**
- * tag
- */
- public static final String TAG = "tag";
-
- /**
- * varName
- */
- public static final String VARNAME = "varName";
-
- /**
- * varNameIsAttr
- */
- public static final String VARNAMEISATTR = "varNameIsAttr";
-
- /**
- * varTypeMode
- */
- public static final String VARTYPEMODE = "varTypeMode";
-
- /**
- * tagName
- */
- public static final String TAGNAME = "tagName";
-
- /**
- * varTypeString
- */
- public static final String VARTYPESTRING = "varTypeString";
-
- /**
- * varTypeStringIsAttr
- */
- public static final String VARTYPESTRINGISATTR = "varTypeStringIsAttr";
-
- /**
- * uri
- */
- public static final String URI = "uri";
-
- private static PageVariableAdatperRegistry _instance = null;
-
- private Map _registry;
-
- private TagVarDescriptor _useBeanDescriptor;
-
- /**
- * @return the singleton instance
- */
- public static PageVariableAdatperRegistry getInstance() {
- if (_instance == null) {
- _instance = new PageVariableAdatperRegistry();
- }
- return _instance;
- }
-
- private PageVariableAdatperRegistry() {
- _registry = readAllDescriptors();
- }
-
- // public IPageVariableAdapter createAdapter(IDOMElement ele, String uri,
- // String tagname)
- // {
- // String key = uri + "#" + tagname;
- // TagVarDescriptor desc = (TagVarDescriptor) _registry.get(key);
- // if (desc != null)
- // {
- // PageVariableAdapter adapter = new PageVariableAdapter(ele);
- // adapter.setVarName(desc.getVarName());
- // adapter.setVarNameAttrName(desc.isVarNameIsAttr());
- // adapter.setVarTypeString(desc.getVarTypeString());
- // adapter.setVarTypeAttrName(desc.isVarTypeStringIsAttr());
- // adapter.setVarTypeMode(desc.getVarTypeMode());
- // return adapter;
- // }
- // else
- // {
- // return null;
- // }
- // }
-
- private Map readAllDescriptors() {
- Map map = new HashMap();
-
- IExtensionPoint extensionPoint = Platform.getExtensionRegistry()
- .getExtensionPoint(JSPCorePlugin.getPluginId(), PAGEVAR);
- IExtension[] extensions = extensionPoint.getExtensions();
-
- for (int i = 0; i < extensions.length; i++) {
- IExtension ext = extensions[i];
- IConfigurationElement[] facs = ext.getConfigurationElements();
-
- for (int j = 0; j < facs.length; j++) {
- if (facs[j].getName().equals(TAGLIB)) {
- String uri = facs[j].getAttribute(URI);
- if (uri == null || uri.length() == 0) {
- continue;
- }
- IConfigurationElement[] tags = facs[j].getChildren(TAG);
- for (int k = 0; k < tags.length; k++) {
- TagVarDescriptor desc = new TagVarDescriptor();
-
- String tag = tags[k].getAttribute(TAGNAME);
- String varName = tags[k].getAttribute(VARNAME);
- boolean varNameIsAttr = "true".equalsIgnoreCase(tags[k]
- .getAttribute(VARNAMEISATTR));
- String varTypeString = tags[k]
- .getAttribute(VARTYPESTRING);
- boolean varTypeStringIsAttr = "true"
- .equalsIgnoreCase(tags[k]
- .getAttribute(VARTYPESTRINGISATTR));
- String varTypeModeString = tags[k]
- .getAttribute(VARTYPEMODE);
- int varTypeMode = toVarTypeMode(varTypeModeString);
-
- desc.setVarName(varName);
- desc.setVarNameIsAttr(varNameIsAttr);
- desc.setVarTypeMode(varTypeMode);
- desc.setVarTypeString(varTypeString);
- desc.setVarTypeStringIsAttr(varTypeStringIsAttr);
- desc.setTagName(tag);
-
- // Use uri#tag as key.
- map.put(uri + "#" + tag, desc);
- }
- }
- }
- }
-
- return map;
- }
-
- /**
- * @param varTypeModeString
- * @return variable typemode
- */
- public static int toVarTypeMode(String varTypeModeString) {
- if ("CLASSNAME".equalsIgnoreCase(varTypeModeString)) {
- return IVariableInfo.CLASSNAME;
- } else if ("EXPRESSION".equalsIgnoreCase(varTypeModeString)) {
- return IVariableInfo.EXPRESSION;
- } else if ("EXPRESSION_COLLECTION_ITEM"
- .equalsIgnoreCase(varTypeModeString)) {
- return IVariableInfo.EXPRESSION_LISTITEM;
- } else if ("BUNDLE".equalsIgnoreCase(varTypeModeString)) {
- return IVariableInfo.RESOURCEBUNDLE;
- } else {
- return IVariableInfo.EXPRESSION; // default
- }
- }
-
- /**
- * @param uri
- * @param tagname
- * @return the tag variable descriptor for the given tag (may be null)
- */
- public TagVarDescriptor getTagVarDescriptor(String uri, String tagname) {
- String key = uri + "#" + tagname;
- return (TagVarDescriptor) _registry.get(key);
- }
-
- /**
- * @param localName
- * @return
- */
- private TagVarDescriptor getJSPTagVarDescriptor(String localName) {
- if (IJSPCoreConstants.TAG_USEBEAN.equals(localName)) {
- if (_useBeanDescriptor == null) {
- _useBeanDescriptor = new TagVarDescriptor();
- _useBeanDescriptor.setVarName(IJSPCoreConstants.ATTR_ID);
- _useBeanDescriptor.setVarNameIsAttr(true);
- _useBeanDescriptor.setVarTypeMode(IVariableInfo.CLASSNAME);
- _useBeanDescriptor
- .setVarTypeString(IJSPCoreConstants.ATTR_CLASS);
- _useBeanDescriptor.setVarTypeStringIsAttr(true);
- }
-
- return _useBeanDescriptor;
- }
-
- return null;
- }
-
- /**
- * @param target
- * @return the tag variable descriptor for the target
- */
- public TagVarDescriptor getTagVarDescriptor(Element target) {
- if (target instanceof IDOMElement) {
- IDOMElement xmlEle = (IDOMElement) target;
- CMElementDeclaration decl = CMUtil.getElementDeclaration(xmlEle);
- if (decl != null) {
- if (CMUtil.isJSP(decl)) {
- return getJSPTagVarDescriptor(xmlEle.getLocalName());
- }
- String uri = CMUtil.getTagURI(decl);
- if (uri != null) {
- return getTagVarDescriptor(uri, xmlEle.getLocalName());
- }
- }
- }
- return null;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/internal/pagevar/TagVarDescriptor.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/internal/pagevar/TagVarDescriptor.java
deleted file mode 100644
index 8e5b649..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/internal/pagevar/TagVarDescriptor.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsp.core.internal.pagevar;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class TagVarDescriptor {
- private String _varName;
-
- private boolean _varNameIsAttr;
-
- private String _varTypeString;
-
- private boolean _varTypeStringIsAttr;
-
- private int _varTypeMode;
-
- private String _tagName;
-
- /**
- * @return the varName
- */
- public String getVarName() {
- return _varName;
- }
-
- /**
- * @param varName
- */
- public void setVarName(String varName) {
- this._varName = varName;
- }
-
- /**
- * @return true if var name is attribute
- */
- public boolean isVarNameIsAttr() {
- return _varNameIsAttr;
- }
-
- /**
- * @param varNameIsAttr
- */
- public void setVarNameIsAttr(boolean varNameIsAttr) {
- this._varNameIsAttr = varNameIsAttr;
- }
-
- /**
- * @return the variable type mode
- */
- public int getVarTypeMode() {
- return _varTypeMode;
- }
-
- /**
- * @param varTypeMode
- */
- public void setVarTypeMode(int varTypeMode) {
- this._varTypeMode = varTypeMode;
- }
-
- /**
- * @return the variable type string
- */
- public String getVarTypeString() {
- return _varTypeString;
- }
-
- /**
- * @param varTypeString
- */
- public void setVarTypeString(String varTypeString) {
- this._varTypeString = varTypeString;
- }
-
- /**
- * @return true if variable type string is attr
- */
- public boolean isVarTypeStringIsAttr() {
- return _varTypeStringIsAttr;
- }
-
- /**
- * @param varTypeStringIsAttr
- */
- public void setVarTypeStringIsAttr(boolean varTypeStringIsAttr) {
- this._varTypeStringIsAttr = varTypeStringIsAttr;
- }
-
- /**
- * @param tag
- */
- public void setTagName(String tag) {
- this._tagName = tag;
- }
-
- /**
- * @return the tag name
- */
- public String getTagName() {
- return this._tagName;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/internal/pagevar/VariableInfo.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/internal/pagevar/VariableInfo.java
deleted file mode 100644
index 6b29b9a..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/internal/pagevar/VariableInfo.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsp.core.internal.pagevar;
-
-import org.eclipse.jst.pagedesigner.jsp.core.pagevar.IVariableInfo;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class VariableInfo implements IVariableInfo {
- private String _typeInfo;
-
- private int _mode;
-
- private String _name;
-
- /**
- * @param name
- * @param mode
- * @param typeInfo
- *
- */
- public VariableInfo(String name, int mode, String typeInfo) {
- this._name = name;
- this._mode = mode;
- this._typeInfo = typeInfo;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.jsp.core.pagevar.IVariableInfo#getName()
- */
- public String getName() {
- return _name;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.jsp.core.pagevar.IVariableInfo#getMode()
- */
- public int getMode() {
- return _mode;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.jsp.core.pagevar.IVariableInfo#getTypeInfoString()
- */
- public String getTypeInfoString() {
- return _typeInfo;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#equals(java.lang.Object)
- */
- // TODO: no hashcode override?
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
- if (obj instanceof VariableInfo) {
- VariableInfo info = (VariableInfo) obj;
- return this._mode == info._mode && equals(this._name, info._name)
- && equals(this._typeInfo, info._typeInfo);
- }
- return false;
- }
-
- private boolean equals(String s1, String s2) {
- if (s1 == null) {
- return s2 == null;
- }
- return s1.equals(s2);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/pagevar/IChangeListener.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/pagevar/IChangeListener.java
deleted file mode 100644
index 9196d0c..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/pagevar/IChangeListener.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsp.core.pagevar;
-
-import java.util.EventListener;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public interface IChangeListener extends EventListener {
- /**
- * fire a changed indication
- */
- public void changed();
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/pagevar/IPageVariablesProvider.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/pagevar/IPageVariablesProvider.java
deleted file mode 100644
index a538ec8..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/pagevar/IPageVariablesProvider.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsp.core.pagevar;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public interface IPageVariablesProvider {
- /**
- *
- */
- public void refresh();
-
- /**
- * @return the bean infos
- */
- public IVariableInfo[] getBeanInfos();
-
- /**
- * @param listener
- */
- public void addChangeListener(IChangeListener listener);
-
- /**
- * @param listener
- */
- public void removeChangeListener(IChangeListener listener);
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/pagevar/IVariableInfo.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/pagevar/IVariableInfo.java
deleted file mode 100644
index a491de0..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/pagevar/IVariableInfo.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsp.core.pagevar;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public interface IVariableInfo {
- /**
- * @return the name
- */
- public String getName();
-
- /**
- * TODO
- */
- public static final int CLASSNAME = 0;
-
- /**
- * TODO
- */
- public static final int EXPRESSION = 1;
-
- /**
- * TODO
- */
- public static final int EXPRESSION_LISTITEM = 2;
-
- /**
- * TODO
- */
- public static final int RESOURCEBUNDLE = 3;
-
- /**
- * @return one of CLASSNAME, EXPRESSION, EXPRESSION_LISTITEM, RESOURCEBUNDLE
- */
- public int getMode();
-
- /**
- * type info string will have different meaning for different mode.
- *
- * @return the type info string
- */
- public String getTypeInfoString();
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/pagevar/adapter/IDocumentPageVariableAdapter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/pagevar/adapter/IDocumentPageVariableAdapter.java
deleted file mode 100644
index 31979ef..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/pagevar/adapter/IDocumentPageVariableAdapter.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsp.core.pagevar.adapter;
-
-import org.eclipse.jst.pagedesigner.jsp.core.pagevar.IPageVariablesProvider;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-
-/**
- * IDocumentPageVariableAdapter will be adapted to the jsp document.
- *
- * @author mengbo
- * @version 1.5
- */
-public interface IDocumentPageVariableAdapter extends IPageVariablesProvider,
- INodeAdapter {
- // TODO: what's this for?
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/pagevar/adapter/IPageVariableAdapter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/pagevar/adapter/IPageVariableAdapter.java
deleted file mode 100644
index 158799f..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/pagevar/adapter/IPageVariableAdapter.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsp.core.pagevar.adapter;
-
-import java.util.List;
-
-import org.eclipse.jst.pagedesigner.jsp.core.pagevar.IVariableInfo;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.w3c.dom.Element;
-
-/**
- * A IPageVariableAdapter normally will be adapted to an JSP tag.
- *
- * @author mengbo
- * @version 1.5
- */
-public interface IPageVariableAdapter extends INodeAdapter {
- /**
- * most JSP tags will only support a single variable.
- * @param element
- *
- * @return true if the tag supports multiple variables
- */
- public boolean supportMultipleVariable(Element element);
-
- /**
- * If only support single variable, this method will return the variable
- * info. This method is provided for better performance.
- *
- * @param element
- * @return null means no variable info provided.
- */
- public IVariableInfo getVariableInfo(Element element);
-
- /**
- * should return a list of IVariableInfo
- * @param element
- *
- * @return the list of variable infos
- */
- public List getVariableInfos(Element element);
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/pagevar/adapter/PageVariableAdapterFactory.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/pagevar/adapter/PageVariableAdapterFactory.java
deleted file mode 100644
index 1c6c64d..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/pagevar/adapter/PageVariableAdapterFactory.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsp.core.pagevar.adapter;
-
-import org.eclipse.jst.pagedesigner.jsp.core.internal.pagevar.PageVariableAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.AbstractAdapterFactory;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class PageVariableAdapterFactory extends AbstractAdapterFactory {
- /**
- *
- */
- public PageVariableAdapterFactory() {
- super(IPageVariableAdapter.class, true);
- }
-
- /*
- * (non-Javadoc)
- * @seeorg.eclipse.wst.sse.core.internal.provisional.AbstractAdapterFactory#createAdapter(org.eclipse.wst.sse.core.internal.provisional.INodeNotifier)
- */
- protected INodeAdapter createAdapter(INodeNotifier target) {
- if (target instanceof IDOMElement) {
- return PageVariableAdapter.getInstance();
- }
- return null;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/util/CMUtil.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/util/CMUtil.java
deleted file mode 100644
index fd299aa..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/util/CMUtil.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsp.core.util;
-
-import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.TLDDocument;
-import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.TLDElementDeclaration;
-import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-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.provisional.contentmodel.CMNodeWrapper;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.eclipse.wst.xml.core.internal.ssemodelquery.ModelQueryAdapter;
-
-/**
- * Utility class to content model related information.
- *
- * @author mengbo
- */
-public class CMUtil {
- /**
- * If the element is a custom tag, get the URI of it. If the element is a
- * standard JSP tag, return null. If is not jsp tag, then return null
- * @param decl
- * @return the tag uri for decl
- */
- public static String getTagURI(CMElementDeclaration decl) {
- if (decl instanceof CMNodeWrapper) {
- decl = (CMElementDeclaration) ((CMNodeWrapper) decl)
- .getOriginNode();
- }
- if (decl instanceof TLDElementDeclaration) {
- CMDocument doc = ((TLDElementDeclaration) decl).getOwnerDocument();
- if (doc instanceof TLDDocument) {
- return ((TLDDocument) doc).getUri();
- }
- }
- return null;
- }
-
- /**
- * get element declaration of specified element
- *
- * @param element
- * @return null if can't get it.
- */
- public static CMElementDeclaration getElementDeclaration(IDOMElement element) {
- INodeNotifier notifier = (INodeNotifier) element.getOwnerDocument();
- if (notifier == null) {
- return null;
- }
- ModelQueryAdapter mqa = (ModelQueryAdapter) notifier
- .getAdapterFor(ModelQueryAdapter.class);
- if (mqa == null) {
- return null;
- }
- return mqa.getModelQuery().getCMElementDeclaration(element);
- }
-
- /**
- * @param element
- * @return the tld element declaration for element
- */
- public static TLDElementDeclaration getTLDElementDeclaration(
- IDOMElement element) {
- CMNode decl = getElementDeclaration(element);
- if (decl instanceof CMNodeWrapper) {
- decl = ((CMNodeWrapper) decl).getOriginNode();
- }
- if (decl instanceof TLDElementDeclaration) {
- return (TLDElementDeclaration) decl;
- }
- return null;
- }
-
- /**
- * @param decl
- * @return true if decl is a JSP tag
- */
- public static boolean isJSP(CMElementDeclaration decl) {
- if (!decl.supports(HTMLCMProperties.IS_JSP)) {
- return false;
- }
- return ((Boolean) decl.getProperty(HTMLCMProperties.IS_JSP))
- .booleanValue();
- }
-}
