JBoss Tools SVN: r6947 - in trunk: core/features/org.jboss.ide.eclipse.feature and 6 other directories.
by jbosstools-commits＠lists.jboss.org
Author: mculpepper(a)jboss.com
Date: 2008-03-17 02:03:52 -0400 (Mon, 17 Mar 2008)
New Revision: 6947
Modified:
trunk/as/features/org.jboss.ide.eclipse.as.feature/feature.xml
trunk/core/features/org.jboss.ide.eclipse.feature/feature.xml
trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.feature/feature.xml
trunk/hibernatetools/features/org.hibernate.eclipse.feature/feature.xml
trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml
trunk/seam/features/org.jboss.tools.seam.feature/feature.xml
trunk/struts/features/org.jboss.tools.struts.feature/feature.xml
trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.xml
Log:
[JBIDE-1499] adding update site to all features
Modified: trunk/as/features/org.jboss.ide.eclipse.as.feature/feature.xml
===================================================================
--- trunk/as/features/org.jboss.ide.eclipse.as.feature/feature.xml 2008-03-15 09:15:46 UTC (rev 6946)
+++ trunk/as/features/org.jboss.ide.eclipse.as.feature/feature.xml 2008-03-17 06:03:52 UTC (rev 6947)
@@ -420,6 +420,11 @@
END OF TERMS AND CONDITIONS
</license>
+ <url>
+ <update label="JBossTools Update Site" url="http://download.jboss.org/jbosstools/updates/stable"/>
+ <discovery label="JBossTools Development Update Site" url="http://download.jboss.org/updates/development"/>
+ </url>
+
<requires>
<import plugin="org.eclipse.core.runtime"/>
<import plugin="org.eclipse.debug.core"/>
Modified: trunk/core/features/org.jboss.ide.eclipse.feature/feature.xml
===================================================================
--- trunk/core/features/org.jboss.ide.eclipse.feature/feature.xml 2008-03-15 09:15:46 UTC (rev 6946)
+++ trunk/core/features/org.jboss.ide.eclipse.feature/feature.xml 2008-03-17 06:03:52 UTC (rev 6947)
@@ -415,7 +415,8 @@
</license>
<url>
- <update label="JBossIDE for Eclipse Update Site" url="http://download.jboss.org/jbosside/updates/stable"/>
+ <update label="JBossTools Update Site" url="http://download.jboss.org/jbosstools/updates/stable"/>
+ <discovery label="JBossTools Development Update Site" url="http://download.jboss.org/updates/development"/>
</url>
<requires>
Modified: trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.feature/feature.xml
===================================================================
--- trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.feature/feature.xml 2008-03-15 09:15:46 UTC (rev 6946)
+++ trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.feature/feature.xml 2008-03-17 06:03:52 UTC (rev 6947)
@@ -423,6 +423,11 @@
END OF TERMS AND CONDITIONS
</license>
+ <url>
+ <update label="JBossTools Update Site" url="http://download.jboss.org/jbosstools/updates/stable"/>
+ <discovery label="JBossTools Development Update Site" url="http://download.jboss.org/updates/development"/>
+ </url>
+
<plugin
id="org.jboss.ide.eclipse.freemarker"
download-size="0"
Modified: trunk/hibernatetools/features/org.hibernate.eclipse.feature/feature.xml
===================================================================
--- trunk/hibernatetools/features/org.hibernate.eclipse.feature/feature.xml 2008-03-15 09:15:46 UTC (rev 6946)
+++ trunk/hibernatetools/features/org.hibernate.eclipse.feature/feature.xml 2008-03-17 06:03:52 UTC (rev 6947)
@@ -417,6 +417,11 @@
END OF TERMS AND CONDITIONS
</license>
+ <url>
+ <update label="JBossTools Update Site" url="http://download.jboss.org/jbosstools/updates/stable"/>
+ <discovery label="JBossTools Development Update Site" url="http://download.jboss.org/updates/development"/>
+ </url>
+
<requires>
<import plugin="org.eclipse.core.runtime" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.ui" version="0.0.0" match="greaterOrEqual"/>
Modified: trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml
===================================================================
--- trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml 2008-03-15 09:15:46 UTC (rev 6946)
+++ trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml 2008-03-17 06:03:52 UTC (rev 6947)
@@ -217,7 +217,12 @@
Each party waives its rights to a jury trial in any resulting
litigation.
</license>
-
+
+ <url>
+ <update label="JBossTools Update Site" url="http://download.jboss.org/jbosstools/updates/stable"/>
+ <discovery label="JBossTools Development Update Site" url="http://download.jboss.org/updates/development"/>
+ </url>
+
<requires>
<import feature="org.jboss.tools.xulrunner.feature" version="1.8.1.3-20070904"/>
</requires>
Modified: trunk/seam/features/org.jboss.tools.seam.feature/feature.xml
===================================================================
--- trunk/seam/features/org.jboss.tools.seam.feature/feature.xml 2008-03-15 09:15:46 UTC (rev 6946)
+++ trunk/seam/features/org.jboss.tools.seam.feature/feature.xml 2008-03-17 06:03:52 UTC (rev 6947)
@@ -217,7 +217,12 @@
Each party waives its rights to a jury trial in any resulting
litigation.
</license>
-
+
+ <url>
+ <update label="JBossTools Update Site" url="http://download.jboss.org/jbosstools/updates/stable"/>
+ <discovery label="JBossTools Development Update Site" url="http://download.jboss.org/updates/development"/>
+ </url>
+
<requires>
<import feature="org.jboss.tools.richfaces.feature"/>
<import feature="org.jboss.ide.eclipse.as.feature"/>
Modified: trunk/struts/features/org.jboss.tools.struts.feature/feature.xml
===================================================================
--- trunk/struts/features/org.jboss.tools.struts.feature/feature.xml 2008-03-15 09:15:46 UTC (rev 6946)
+++ trunk/struts/features/org.jboss.tools.struts.feature/feature.xml 2008-03-17 06:03:52 UTC (rev 6947)
@@ -217,6 +217,11 @@
litigation.
</license>
+ <url>
+ <update label="JBossTools Update Site" url="http://download.jboss.org/jbosstools/updates/stable"/>
+ <discovery label="JBossTools Development Update Site" url="http://download.jboss.org/updates/development"/>
+ </url>
+
<plugin
id="org.jboss.tools.struts"
download-size="0"
Modified: trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.xml
===================================================================
--- trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.xml 2008-03-15 09:15:46 UTC (rev 6946)
+++ trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.xml 2008-03-17 06:03:52 UTC (rev 6947)
@@ -5,18 +5,426 @@
version="1.8.1.3-20070904"
provider-name="JBoss, a division of Red Hat">
- <description url="http://www.example.com/description">
- [Enter Feature Description here.]
+ <description url="http://jboss.org/tools">
+ A feature that provides Mozilla's XULRunner as various platform-dependent plug-ins for Eclipse.
</description>
- <copyright url="http://www.example.com/copyright">
- [Enter Copyright Description here.]
+ <copyright>
+ JBoss, Home of Professional Open Source
+Copyright 2006, JBoss Inc., and individual contributors as indicated
+by the @authors tag. See the copyright.txt in the distribution
+for a full listing of individual contributors.
</copyright>
- <license url="http://www.example.com/license">
- [Enter License Description here.]
+ <license url="http://osdn.dl.sourceforge.net/sourceforge/jboss/LGPL.html">
+ JBossTools is under the LGPL Licence
+GNU LESSER GENERAL PUBLIC LICENSE
+Version 2.1, February 1999
+Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+[This is the first released version of the Lesser GPL. It also
+counts
+as the successor of the GNU Library Public License, version 2,
+hence
+the version number 2.1.]
+Preamble
+The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General
+Public Licenses are intended to guarantee your freedom to share
+and change free software--to make sure the software is free for
+all its users.
+This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of
+the Free Software Foundation and other authors who decide to
+use it. You can use it too, but we suggest you first think carefully
+about whether this license or the ordinary General Public License
+is the better strategy to use in any particular case, based on
+the explanations below.
+When we speak of free software, we are referring to freedom of
+use, not price. Our General Public Licenses are designed to make
+sure that you have the freedom to distribute copies of free software
+(and charge for this service if you wish); that you receive source
+code or can get it if you want it; that you can change the software
+and use pieces of it in new free programs; and that you are informed
+that you can do these things.
+To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender
+these rights. These restrictions translate to certain responsibilities
+for you if you distribute copies of the library or if you modify
+it.
+For example, if you distribute copies of the library, whether
+gratis or for a fee, you must give the recipients all the rights
+that we gave you. You must make sure that they, too, receive
+or can get the source code. If you link other code with the library,
+you must provide complete object files to the recipients, so
+that they can relink them with the library after making changes
+to the library and recompiling it. And you must show them these
+terms so they know their rights.
+We protect your rights with a two-step method: (1) we copyright
+the library, and (2) we offer you this license, which gives you
+legal permission to copy, distribute and/or modify the library.
+To protect each distributor, we want to make it very clear that
+there is no warranty for the free library. Also, if the library
+is modified by someone else and passed on, the recipients should
+know that what they have is not the original version, so that
+the original author's reputation will not be affected by problems
+that might be introduced by others.
+Finally, software patents pose a constant threat to the existence
+of any free program. We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining
+a restrictive license from a patent holder. Therefore, we insist
+that any patent license obtained for a version of the library
+must be consistent with the full freedom of use specified in
+this license.
+Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License. This license, the GNU Lesser
+General Public License, applies to certain designated libraries,
+and is quite different from the ordinary General Public License.
+We use this license for certain libraries in order to permit
+linking those libraries into non-free programs.
+When a program is linked with a library, whether statically or
+using a shared library, the combination of the two is legally
+speaking a combined work, a derivative of the original library.
+The ordinary General Public License therefore permits such linking
+only if the entire combination fits its criteria of freedom.
+The Lesser General Public License permits more lax criteria for
+linking other code with the library.
+We call this license the "Lesser" General Public License because
+it does Less to protect the user's freedom than the ordinary
+General Public License. It also provides other free software
+developers Less of an advantage over competing non-free programs.
+These disadvantages are the reason we use the ordinary General
+Public License for many libraries. However, the Lesser license
+provides advantages in certain special circumstances.
+For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that
+it becomes a de-facto standard. To achieve this, non-free programs
+must be allowed to use the library. A more frequent case is that
+a free library does the same job as widely used non-free libraries.
+In this case, there is little to gain by limiting the free library
+to free software only, so we use the Lesser General Public License.
+In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body
+of free software. For example, permission to use the GNU C Library
+in non-free programs enables many more people to use the whole
+GNU operating system, as well as its variant, the GNU/Linux operating
+system.
+Although the Lesser General Public License is Less protective
+of the users' freedom, it does ensure that the user of a program
+that is linked with the Library has the freedom and the wherewithal
+to run that program using a modified version of the Library.
+The precise terms and conditions for copying, distribution and
+modification follow. Pay close attention to the difference between
+a "work based on the library" and a "work that uses the library".
+The former contains code derived from the library, whereas the
+latter must be combined with the library in order to run.
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+0. This License Agreement applies to any software library or
+other program which contains a notice placed by the copyright
+holder or other authorized party saying it may be distributed
+under the terms of this Lesser General Public License (also called
+"this License"). Each licensee is addressed as "you".
+A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+The "Library", below, refers to any such software library or
+work which has been distributed under these terms. A "work based
+on the Library" means either the Library or any derivative work
+under copyright law: that is to say, a work containing the Library
+or a portion of it, either verbatim or with modifications and/or
+translated straightforwardly into another language. (Hereinafter,
+translation is included without limitation in the term "modification".)
+"Source code" for a work means the preferred form of the work
+for making modifications to it. For a library, complete source
+code means all the source code for all modules it contains, plus
+any associated interface definition files, plus the scripts used
+to control compilation and installation of the library.
+Activities other than copying, distribution and modification
+are not covered by this License; they are outside its scope.
+The act of running a program using the Library is not restricted,
+and output from such a program is covered only if its contents
+constitute a work based on the Library (independent of the use
+of the Library in a tool for writing it). Whether that is true
+depends on what the Library does and what the program that uses
+the Library does.
+1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided
+that you conspicuously and appropriately publish on each copy
+an appropriate copyright notice and disclaimer of warranty; keep
+intact all the notices that refer to this License and to the
+absence of any warranty; and distribute a copy of this License
+along with the Library.
+You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange
+for a fee.
+2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section
+1 above, provided that you also meet all of these conditions:
+a) The modified work must itself be a software library.
+b) You must cause the files modified to carry prominent notices
+stating that you changed the files and the date of any change.
+c) You must cause the whole of the work to be licensed at no
+charge to all third parties under the terms of this License.
+d) If a facility in the modified Library refers to a function
+or a table of data to be supplied by an application program that
+uses the facility, other than as an argument passed when the
+facility is invoked, then you must make a good faith effort to
+ensure that, in the event an application does not supply such
+function or table, the facility still operates, and performs
+whatever part of its purpose remains meaningful.
+(For example, a function in a library to compute square roots
+has a purpose that is entirely well-defined independent of the
+application. Therefore, Subsection 2d requires that any application-supplied
+function or table used by this function must be optional: if
+the application does not supply it, the square root function
+must still compute square roots.)
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works
+in themselves, then this License, and its terms, do not apply
+to those sections when you distribute them as separate works.
+But when you distribute the same sections as part of a whole
+which is a work based on the Library, the distribution of the
+whole must be on the terms of this License, whose permissions
+for other licensees extend to the entire whole, and thus to each
+and every part regardless of who wrote it.
+Thus, it is not the intent of this section to claim rights or
+contest your rights to work written entirely by you; rather,
+the intent is to exercise the right to control the distribution
+of derivative or collective works based on the Library.
+In addition, mere aggregation of another work not based on the
+Library with the Library (or with a work based on the Library)
+on a volume of a storage or distribution medium does not bring
+the other work under the scope of this License.
+3. You may opt to apply the terms of the ordinary GNU General
+Public License instead of this License to a given copy of the
+Library. To do this, you must alter all the notices that refer
+to this License, so that they refer to the ordinary GNU General
+Public License, version 2, instead of to this License. (If a
+newer version than version 2 of the ordinary GNU General Public
+License has appeared, then you can specify that version instead
+if you wish.) Do not make any other change in these notices.
+Once this change is made in a given copy, it is irreversible
+for that copy, so the ordinary GNU General Public License applies
+to all subsequent copies and derivative works made from that
+copy.
+This option is useful when you wish to copy part of the code
+of the Library into a program that is not a library.
+4. You may copy and distribute the Library (or a portion or derivative
+of it, under Section 2) in object code or executable form under
+the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code,
+which must be distributed under the terms of Sections 1 and 2
+above on a medium customarily used for software interchange.
+If distribution of object code is made by offering access to
+copy from a designated place, then offering equivalent access
+to copy the source code from the same place satisfies the requirement
+to distribute the source code, even though third parties are
+not compelled to copy the source along with the object code.
+5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled
+or linked with it, is called a "work that uses the Library".
+Such a work, in isolation, is not a derivative work of the Library,
+and therefore falls outside the scope of this License.
+However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because
+it contains portions of the Library), rather than a "work that
+uses the library". The executable is therefore covered by this
+License. Section 6 states terms for distribution of such executables.
+When a "work that uses the Library" uses material from a header
+file that is part of the Library, the object code for the work
+may be a derivative work of the Library even though the source
+code is not. Whether this is true is especially significant if
+the work can be linked without the Library, or if the work is
+itself a library. The threshold for this to be true is not precisely
+defined by law.
+If such an object file uses only numerical parameters, data structure
+layouts and accessors, and small macros and small inline functions
+(ten lines or less in length), then the use of the object file
+is unrestricted, regardless of whether it is legally a derivative
+work. (Executables containing this object code plus portions
+of the Library will still fall under Section 6.)
+Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section
+6. Any executables containing that work also fall under Section
+6, whether or not they are linked directly with the Library itself.
+6. As an exception to the Sections above, you may also combine
+or link a "work that uses the Library" with the Library to produce
+a work containing portions of the Library, and distribute that
+work under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+You must give prominent notice with each copy of the work that
+the Library is used in it and that the Library and its use are
+covered by this License. You must supply a copy of this License.
+If the work during execution displays copyright notices, you
+must include the copyright notice for the Library among them,
+as well as a reference directing the user to the copy of this
+License. Also, you must do one of these things:
+a) Accompany the work with the complete corresponding machine-readable
+source code for the Library including whatever changes were used
+in the work (which must be distributed under Sections 1 and 2
+above); and, if the work is an executable linked with the Library,
+with the complete machine-readable "work that uses the Library",
+as object code and/or source code, so that the user can modify
+the Library and then relink to produce a modified executable
+containing the modified Library. (It is understood that the user
+who changes the contents of definitions files in the Library
+will not necessarily be able to recompile the application to
+use the modified definitions.)
+b) Use a suitable shared library mechanism for linking with the
+Library. A suitable mechanism is one that (1) uses at run time
+a copy of the library already present on the user's computer
+system, rather than copying library functions into the executable,
+and (2) will operate properly with a modified version of the
+library, if the user installs one, as long as the modified version
+is interface-compatible with the version that the work was made
+with.
+c) Accompany the work with a written offer, valid for at least
+three years, to give the same user the materials specified in
+Subsection 6a, above, for a charge no more than the cost of performing
+this distribution.
+d) If distribution of the work is made by offering access to
+copy from a designated place, offer equivalent access to copy
+the above specified materials from the same place.
+e) Verify that the user has already received a copy of these
+materials or that you have already sent this user a copy.
+For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it. However, as a special exception,
+the materials to be distributed need not include anything that
+is normally distributed (in either source or binary form) with
+the major components (compiler, kernel, and so on) of the operating
+system on which the executable runs, unless that component itself
+accompanies the executable.
+It may happen that this requirement contradicts the license restrictions
+of other proprietary libraries that do not normally accompany
+the operating system. Such a contradiction means you cannot use
+both them and the Library together in an executable that you
+distribute.
+7. You may place library facilities that are a work based on
+the Library side-by-side in a single library together with other
+library facilities not covered by this License, and distribute
+such a combined library, provided that the separate distribution
+of the work based on the Library and of the other library facilities
+is otherwise permitted, and provided that you do these two things:
+a) Accompany the combined library with a copy of the same work
+based on the Library, uncombined with any other library facilities.
+This must be distributed under the terms of the Sections above.
+b) Give prominent notice with the combined library of the fact
+that part of it is a work based on the Library, and explaining
+where to find the accompanying uncombined form of the same work.
+8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.
+Any attempt otherwise to copy, modify, sublicense, link with,
+or distribute the Library is void, and will automatically terminate
+your rights under this License. However, parties who have received
+copies, or rights, from you under this License will not have
+their licenses terminated so long as such parties remain in full
+compliance.
+9. You are not required to accept this License, since you have
+not signed it. However, nothing else grants you permission to
+modify or distribute the Library or its derivative works. These
+actions are prohibited by law if you do not accept this License.
+Therefore, by modifying or distributing the Library (or any work
+based on the Library), you indicate your acceptance of this License
+to do so, and all its terms and conditions for copying, distributing
+or modifying the Library or works based on it.
+10. Each time you redistribute the Library (or any work based
+on the Library), the recipient automatically receives a license
+from the original licensor to copy, distribute, link with or
+modify the Library subject to these terms and conditions. You
+may not impose any further restrictions on the recipients' exercise
+of the rights granted herein. You are not responsible for enforcing
+compliance by third parties with this License.
+11. If, as a consequence of a court judgment or allegation of
+patent infringement or for any other reason (not limited to patent
+issues), conditions are imposed on you (whether by court order,
+agreement or otherwise) that contradict the conditions of this
+License, they do not excuse you from the conditions of this License.
+If you cannot distribute so as to satisfy simultaneously your
+obligations under this License and any other pertinent obligations,
+then as a consequence you may not distribute the Library at all.
+For example, if a patent license would not permit royalty-free
+redistribution of the Library by all those who receive copies
+directly or indirectly through you, then the only way you could
+satisfy both it and this License would be to refrain entirely
+from distribution of the Library.
+If any portion of this section is held invalid or unenforceable
+under any particular circumstance, the balance of the section
+is intended to apply, and the section as a whole is intended
+to apply in other circumstances.
+It is not the purpose of this section to induce you to infringe
+any patents or other property right claims or to contest validity
+of any such claims; this section has the sole purpose of protecting
+the integrity of the free software distribution system which
+is implemented by public license practices. Many people have
+made generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of
+that system; it is up to the author/donor to decide if he or
+she is willing to distribute software through any other system
+and a licensee cannot impose that choice.
+This section is intended to make thoroughly clear what is believed
+to be a consequence of the rest of this License.
+12. If the distribution and/or use of the Library is restricted
+in certain countries either by patents or by copyrighted interfaces,
+the original copyright holder who places the Library under this
+License may add an explicit geographical distribution limitation
+excluding those countries, so that distribution is permitted
+only in or among countries not thus excluded. In such case, this
+License incorporates the limitation as if written in the body
+of this License.
+13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+Each version is given a distinguishing version number. If the
+Library specifies a version number of this License which applies
+to it and "any later version", you have the option of following
+the terms and conditions either of that version or of any later
+version published by the Free Software Foundation. If the Library
+does not specify a license version number, you may choose any
+version ever published by the Free Software Foundation.
+14. If you wish to incorporate parts of the Library into other
+free programs whose distribution conditions are incompatible
+with these, write to the author to ask for permission. For software
+which is copyrighted by the Free Software Foundation, write to
+the Free Software Foundation; we sometimes make exceptions for
+this. Our decision will be guided by the two goals of preserving
+the free status of all derivatives of our free software and of
+promoting the sharing and reuse of software generally.
+NO WARRANTY
+15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS
+NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE
+LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS
+AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
+PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE
+DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR
+OR CORRECTION.
+16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO
+IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO
+MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE,
+BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL,
+INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR
+INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS
+OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED
+BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE
+WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY
+HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+END OF TERMS AND CONDITIONS
</license>
+ <url>
+ <update label="JBossTools Update Site" url="http://download.jboss.org/jbosstools/updates/stable"/>
+ <discovery label="JBossTools Development Update Site" url="http://download.jboss.org/updates/development"/>
+ </url>
+
<plugin
id="org.mozilla.xpcom"
download-size="0"
16 years, 6 months
JBoss Tools SVN: r6946 - trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-03-15 05:15:46 -0400 (Sat, 15 Mar 2008)
New Revision: 6946
Modified:
trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/WorkbenchUtils.java
Log:
fix for compilation error
Modified: trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/WorkbenchUtils.java
===================================================================
--- trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/WorkbenchUtils.java 2008-03-14 20:08:00 UTC (rev 6945)
+++ trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/WorkbenchUtils.java 2008-03-15 09:15:46 UTC (rev 6946)
@@ -13,6 +13,7 @@
import junit.framework.TestCase;
+import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jface.preference.PreferenceDialog;
import org.eclipse.jface.preference.PreferenceManager;
@@ -77,4 +78,11 @@
.getActiveShell(), pageId, new String[] {pageId}, null);
}
+ public static PreferenceDialog createPropertyDialog(String pageId,
+ IProject project) {
+
+ return PreferencesUtil.createPreferenceDialogOn(WorkbenchUtils
+ .getActiveShell(), pageId, new String[] {pageId}, project);
+ }
+
}
16 years, 6 months
JBoss Tools SVN: r6945 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-03-14 16:08:00 -0400 (Fri, 14 Mar 2008)
New Revision: 6945
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-1911 seam find references/declartions does not show exact location in xml (e.g. components.xml)
gotoMarker() is extended to support "org.eclipse.search.searchmarker" marker type
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java 2008-03-14 19:58:13 UTC (rev 6944)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java 2008-03-14 20:08:00 UTC (rev 6945)
@@ -392,7 +392,7 @@
}
public void gotoMarker(IMarker marker) {
- if(getModelObject() == null) return;
+ if(marker == null || getModelObject() == null) return;
String path = marker.getAttribute("path", null);
if(path != null) {
XModelObject o = getModelObject().getModel().getByPath(path);
16 years, 6 months
JBoss Tools SVN: r6944 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-03-14 15:58:13 -0400 (Fri, 14 Mar 2008)
New Revision: 6944
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-1911 seam find references/declartions does not show exact location in xml (e.g. components.xml)
gotoMarker() is extended to support "org.eclipse.search.searchmarker" marker type
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java 2008-03-14 19:05:23 UTC (rev 6943)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java 2008-03-14 19:58:13 UTC (rev 6944)
@@ -411,6 +411,20 @@
postponedTextSelection.select(o, attr);
}
}
+ } else {
+ try {
+ if ("org.eclipse.search.searchmarker".equals(marker.getType())) {
+ int offset = marker.getAttribute(IMarker.CHAR_START, -1);
+ int length = marker.getAttribute(IMarker.CHAR_END, -1);
+ if (offset > -1 && length > -1) {
+ postponedTextSelection.clean();
+ textEditor.gotoMarker(marker);
+ }
+ }
+ } catch (CoreException e) {
+ ModelUIPlugin.getPluginLog().logError(e);
+ }
+
}
}
16 years, 6 months
JBoss Tools SVN: r6943 - in trunk/seam/plugins/org.jboss.tools.seam.ui: src/org/jboss/tools/seam/ui and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-03-14 15:05:23 -0400 (Fri, 14 Mar 2008)
New Revision: 6943
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/FindSeamAction.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/SeamFindQuickAssistProcessor.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties
Log:
http://jira.jboss.org/jira/browse/JBIDE-1912 ctrl+1 Find seam references should tell what it will actually search for
Issue is fixed
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2008-03-14 19:02:55 UTC (rev 6942)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2008-03-14 19:05:23 UTC (rev 6943)
@@ -450,7 +450,7 @@
class="org.jboss.tools.seam.ui.actions.FindSeamDeclarationsAction"
definitionId="org.jboss.tools.seam.ui.find.declarations"
helpContextId="org.eclipse.jdt.ui.find_declarations_action"
- icon="icons/open_seam_component.gif"
+ icon="icons/find_seam_declarations.gif"
id="findDeclarations"
label="Find Seam Declarations"
menubarPath="navigate/open.ext2"
@@ -461,7 +461,7 @@
class="org.jboss.tools.seam.ui.actions.FindSeamReferencesAction"
definitionId="org.jboss.tools.seam.ui.find.references"
helpContextId="org.eclipse.jdt.ui.find_references_action"
- icon="icons/open_seam_component.gif"
+ icon="icons/find_seam_references.gif"
id="findReferences"
label="Find Seam References"
menubarPath="navigate/open.ext2"
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java 2008-03-14 19:02:55 UTC (rev 6942)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java 2008-03-14 19:05:23 UTC (rev 6943)
@@ -449,6 +449,11 @@
public static String SeamSearchVisitor_scanning;
+ public static String SeamSearch;
+
+ public static String SeamQuickFixFindDeclarations;
+ public static String SeamQuickFixFindReferences;
+
static {
// load message values from bundle file
NLS.initializeMessages(BUNDLE_NAME, SeamUIMessages.class);
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/FindSeamAction.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/FindSeamAction.java 2008-03-14 19:02:55 UTC (rev 6942)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/FindSeamAction.java 2008-03-14 19:05:23 UTC (rev 6943)
@@ -107,18 +107,12 @@
if (seamProject == null)
return;
- int elStart = getELStart(document, selectionOffset);
-
- if (elStart == -1)
- elStart = selectionOffset;
+ List<ELOperandToken> tokens = findTokensAtOffset(document, selectionOffset);
- SeamELOperandTokenizerForward tokenizer = new SeamELOperandTokenizerForward(document, elStart);
- List<ELOperandToken> tokens = tokenizer.getTokens();
-
- if (tokens == null || tokens.size() == 0)
+ if (tokens == null)
return; // No EL Operand found
- String[] varNamesToSearch = findVariableNames(seamProject, document, tokens, elStart);
+ String[] varNamesToSearch = findVariableNames(seamProject, document, tokens);
if (varNamesToSearch != null) {
try {
@@ -168,7 +162,19 @@
}
}
- private String[] findVariableNames(ISeamProject seamProject, IDocument document, List<ELOperandToken> tokens, int elStartOffset) {
+ public static List<ELOperandToken> findTokensAtOffset(IDocument document, int offset) {
+ int elStart = getELStart(document, offset);
+
+ if (elStart == -1)
+ elStart = offset;
+
+ SeamELOperandTokenizerForward tokenizer = new SeamELOperandTokenizerForward(document, elStart);
+ List<ELOperandToken> tokens = tokenizer.getTokens();
+
+ return (tokens == null || tokens.size() == 0) ? null : tokens;
+ }
+
+ public static String[] findVariableNames(ISeamProject seamProject, IDocument document, List<ELOperandToken> tokens) {
String[] varNames = null;
List<List<ELOperandToken>> variations = SeamELCompletionEngine.getPossibleVarsFromPrefix(tokens);
@@ -202,8 +208,6 @@
return varNames;
}
-
-
// ---- IWorkbenchWindowActionDelegate
// ------------------------------------------------
@@ -239,7 +243,7 @@
* Scans the document from the offset to the beginning to find start of Seam EL operand
* Returns the start position of first Seam EL operand token
*/
- private int getELStart(IDocument document, int offset) {
+ private static int getELStart(IDocument document, int offset) {
SeamELOperandTokenizer tokenizer = new SeamELOperandTokenizer(document, offset);
List<ELOperandToken> tokens = tokenizer.getTokens();
@@ -254,7 +258,7 @@
* Scans the document from the offset to the beginning to find start of Seam EL operand
* Returns the end position of last Seam EL operand token
*/
- private int getELEnd(IDocument document, int offset) {
+ private static int getELEnd(IDocument document, int offset) {
SeamELOperandTokenizer tokenizer = new SeamELOperandTokenizerForward(document, offset);
List<ELOperandToken> tokens = tokenizer.getTokens();
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/SeamFindQuickAssistProcessor.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/SeamFindQuickAssistProcessor.java 2008-03-14 19:02:55 UTC (rev 6942)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/SeamFindQuickAssistProcessor.java 2008-03-14 19:05:23 UTC (rev 6943)
@@ -1,5 +1,7 @@
package org.jboss.tools.seam.ui.actions;
+import java.util.List;
+
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
@@ -16,12 +18,15 @@
import org.eclipse.jface.text.contentassist.CompletionProposal;
import org.eclipse.jface.text.contentassist.ICompletionProposal;
import org.eclipse.jface.text.contentassist.IContextInformation;
+import org.eclipse.search.internal.ui.Messages;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.Point;
import org.eclipse.ui.part.FileEditorInput;
import org.jboss.tools.seam.core.ISeamProject;
import org.jboss.tools.seam.core.SeamCorePlugin;
+import org.jboss.tools.seam.internal.core.el.ELOperandToken;
import org.jboss.tools.seam.ui.SeamGuiPlugin;
+import org.jboss.tools.seam.ui.SeamUIMessages;
import org.jboss.tools.seam.ui.SeamUiImages;
public class SeamFindQuickAssistProcessor implements IQuickAssistProcessor {
@@ -30,18 +35,41 @@
}
public boolean hasAssists(IInvocationContext context) throws CoreException {
+ ISeamProject seamProject = getSeamProject(context);
+ if (seamProject==null)
+ return false;
+
+ IDocument document = getDocument( context.getCompilationUnit() );
+
+ String[] varNames = getVariableNames(seamProject, document, context.getSelectionOffset());
+
+ return (varNames != null && varNames.length != 0);
+ }
+
+ private ISeamProject getSeamProject(IInvocationContext context) {
ICompilationUnit cu = context.getCompilationUnit();
if (cu == null)
- return false;
+ return null;
IResource javaFile = cu.getResource();
if (javaFile == null)
- return false;
+ return null;
- ISeamProject seamProject = SeamCorePlugin.getSeamProject(javaFile.getProject(), true);
- return (seamProject!=null);
+ return SeamCorePlugin.getSeamProject(javaFile.getProject(), true);
}
-
+
+ private String[] getVariableNames(ISeamProject seamProject, IDocument document, int offset) {
+ List<ELOperandToken> tokens = FindSeamAction.findTokensAtOffset(
+ document,
+ offset);
+
+ if (tokens == null)
+ return null;
+
+ return FindSeamAction.findVariableNames(seamProject,
+ document, tokens);
+ }
+
public IJavaCompletionProposal[] getAssists(IInvocationContext context,
IProblemLocation[] locations) throws CoreException {
@@ -51,14 +79,46 @@
IDocument document = getDocument( context.getCompilationUnit() );
try {
String contents = document.get( context.getSelectionOffset(), context.getSelectionLength() );
+ String searchString = "";
+
+ ISeamProject seamProject = getSeamProject(context);
+ if (seamProject == null)
+ return result;
+
+ String[] variables = getVariableNames(seamProject, document, context.getSelectionOffset());
+
+ if (variables == null)
+ return result;
+
+ StringBuffer buf= new StringBuffer();
+ for (int i= 0; i < variables.length; i++) {
+ if (i > 0) {
+ buf.append(", "); //$NON-NLS-1$
+ }
+ buf.append(variables[i]);
+ }
+ searchString = buf.toString();
+
result = new IJavaCompletionProposal[2];
- result[0] = new ExternalActionQuickAssistProposal(contents, SeamUiImages.getImage("find_seam_declarations.gif"), "Find Seam Declarations", context) {
+ result[0] = new ExternalActionQuickAssistProposal(
+ contents,
+ SeamUiImages.getImage("find_seam_declarations.gif"),
+ Messages.format(
+ SeamUIMessages.SeamQuickFixFindDeclarations,
+ new Object[] {searchString}),
+ context) {
public void apply(IDocument target) {
new FindSeamDeclarationsAction().run();
}
};
- result[1] = new ExternalActionQuickAssistProposal(contents, SeamUiImages.getImage("find_seam_references.gif"), "Find Seam References", context) {
+ result[1] = new ExternalActionQuickAssistProposal(
+ contents,
+ SeamUiImages.getImage("find_seam_references.gif"),
+ Messages.format(
+ SeamUIMessages.SeamQuickFixFindReferences,
+ new Object[] {searchString}),
+ context) {
public void apply(IDocument target) {
new FindSeamReferencesAction().run();
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties 2008-03-14 19:02:55 UTC (rev 6942)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties 2008-03-14 19:05:23 UTC (rev 6943)
@@ -233,3 +233,6 @@
# The first argument will be replaced by the pattern, the second by the scope
SeamSearchQuery_singularLabel= ''{0}'' - 1 match in {1} ({2})
SeamSearchVisitor_scanning= Scanning Seam project {1} of {2}: {0}
+SeamSearch="Seam Search - "
+SeamQuickFixFindDeclarations=Find Seam declarations for ''{0}''
+SeamQuickFixFindReferences=Find Seam references for ''{0}''
\ No newline at end of file
16 years, 6 months
JBoss Tools SVN: r6942 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-03-14 15:02:55 -0400 (Fri, 14 Mar 2008)
New Revision: 6942
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogCellEditorContentAssistProcessor.java
Log:
JBIDE-1825
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java 2008-03-14 18:15:17 UTC (rev 6941)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java 2008-03-14 19:02:55 UTC (rev 6942)
@@ -117,7 +117,7 @@
return proposals;
}
- private ICompletionProposal[] getUniqProposals(ICompletionProposal[] proposals) {
+ static ICompletionProposal[] getUniqProposals(ICompletionProposal[] proposals) {
if(proposals==null) {
return null;
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogCellEditorContentAssistProcessor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogCellEditorContentAssistProcessor.java 2008-03-14 18:15:17 UTC (rev 6941)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogCellEditorContentAssistProcessor.java 2008-03-14 19:02:55 UTC (rev 6942)
@@ -56,7 +56,8 @@
IDocument document = contentAssistSubjectControl.getDocument();
String text = document.get();
addAttributeValueProposals(proposals, text, documentOffset);
- return (ICompletionProposal[])proposals.toArray(new ICompletionProposal[0]);
+ ICompletionProposal[] ps = (ICompletionProposal[])proposals.toArray(new ICompletionProposal[0]);
+ return FaceletsHtmlContentAssistProcessor.getUniqProposals(ps);
}
//not implemented
16 years, 6 months
JBoss Tools SVN: r6941 - trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/appregister.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-03-14 14:15:17 -0400 (Fri, 14 Mar 2008)
New Revision: 6941
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/appregister/AppRegisterComponent.java
Log:
JBIDE-1849
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/appregister/AppRegisterComponent.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/appregister/AppRegisterComponent.java 2008-03-14 18:13:51 UTC (rev 6940)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/appregister/AppRegisterComponent.java 2008-03-14 18:15:17 UTC (rev 6941)
@@ -29,6 +29,7 @@
import org.jboss.tools.common.model.ui.attribute.editor.ExtendedFieldEditor;
import org.jboss.tools.common.model.ui.attribute.editor.IMutableFieldEditor;
import org.jboss.tools.common.model.ui.attribute.editor.IPropertyEditor;
+import org.jboss.tools.common.model.ui.attribute.editor.MutableComboBoxFieldEditor;
import org.jboss.tools.common.model.ui.attribute.editor.MutableMultipleChoiceFieldEditor;
import org.eclipse.jface.window.Window;
@@ -338,6 +339,13 @@
Shell shell = (Shell)p.get("shell");
IServer server = newServer(shell);
if(server == null) return -1;
+
+ IModelPropertyEditorAdapter a = support.getPropertyEditorAdapterByName(ATTR_RUNTIME);
+ if(server.getRuntime() != null && !server.getRuntime().getName().equals(a.getValue())) {
+ MutableComboBoxFieldEditor ed1 = (MutableComboBoxFieldEditor)support.getFieldEditorByName(ATTR_RUNTIME);
+ ed1.setNewValue(server.getRuntime().getName());
+ }
+
p.setProperty("value", server.getName());
initTargetServerValue();
MutableMultipleChoiceFieldEditor ed = (MutableMultipleChoiceFieldEditor)support.getFieldEditorByName(ATTR_TARGET_SERVER);
16 years, 6 months
JBoss Tools SVN: r6940 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-03-14 14:13:51 -0400 (Fri, 14 Mar 2008)
New Revision: 6940
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/MultipleChoiceFieldEditor.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/MutableComboBoxFieldEditor.java
Log:
JBIDE-1849
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/MultipleChoiceFieldEditor.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/MultipleChoiceFieldEditor.java 2008-03-14 17:16:31 UTC (rev 6939)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/MultipleChoiceFieldEditor.java 2008-03-14 18:13:51 UTC (rev 6940)
@@ -257,7 +257,7 @@
}
}
- protected void resetChoices() {
+ public void resetChoices() {
updateChoices();
buttonsParent.pack();
buttonsParent.layout();
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/MutableComboBoxFieldEditor.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/MutableComboBoxFieldEditor.java 2008-03-14 17:16:31 UTC (rev 6939)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/MutableComboBoxFieldEditor.java 2008-03-14 18:13:51 UTC (rev 6940)
@@ -130,10 +130,7 @@
changeButton.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent evt) {
String newValue = changePressed();
- if (newValue != null) {
- getComboField().setItems(getTags());
- setStringValue(newValue);
- }
+ setNewValue(newValue);
}
});
changeButton.addDisposeListener(new DisposeListener() {
@@ -146,6 +143,13 @@
}
return changeButton;
}
+
+ public void setNewValue(String newValue) {
+ if (newValue != null) {
+ getComboField().setItems(getTags());
+ setStringValue(newValue);
+ }
+ }
public int getNumberOfControls() {
return 3;
16 years, 6 months
JBoss Tools SVN: r6939 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-03-14 13:16:31 -0400 (Fri, 14 Mar 2008)
New Revision: 6939
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/FindSeamAction.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-1880 Exception when using seam references
NullPointerException is fixed
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/FindSeamAction.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/FindSeamAction.java 2008-03-14 17:01:38 UTC (rev 6938)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/FindSeamAction.java 2008-03-14 17:16:31 UTC (rev 6939)
@@ -81,14 +81,12 @@
if (viewer == null)
return;
-
document = viewer.getDocument();
ISelection selection = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService().getSelection();
if (selection.isEmpty())
return;
-
int selectionOffset = 0;
if (selection instanceof ITextSelection) {
ITextSelection tSel = (ITextSelection)selection;
@@ -109,45 +107,20 @@
if (seamProject == null)
return;
- SeamELCompletionEngine engine= new SeamELCompletionEngine();
-
int elStart = getELStart(document, selectionOffset);
if (elStart == -1)
elStart = selectionOffset;
-
+
SeamELOperandTokenizerForward tokenizer = new SeamELOperandTokenizerForward(document, elStart);
List<ELOperandToken> tokens = tokenizer.getTokens();
if (tokens == null || tokens.size() == 0)
return; // No EL Operand found
-
- List<List<ELOperandToken>> variations = SeamELCompletionEngine.getPossibleVarsFromPrefix(tokens);
- // Define the Seam project variables to search for declarations
- List<ISeamContextVariable> variables = new ArrayList<ISeamContextVariable>();
-
- for (List<ELOperandToken> variation : variations) {
- try {
- int start = variation.get(0).getStart();
- int end = variation.get(variation.size() - 1).getStart() +
- variation.get(variation.size() - 1).getLength();
- String variationText = document.get(start, end - start);
-
- Set<ISeamContextVariable> vars = seamProject.getVariablesByName(variationText);
- variables.addAll(vars);
- } catch (BadLocationException e1) {
- SeamGuiPlugin.getPluginLog().logError(e1);
- }
- }
+ String[] varNamesToSearch = findVariableNames(seamProject, document, tokens, elStart);
- if (variables.size() != 0) {
- // Some variable/variables are found - perform search for their declarations
- String[] varNamesToSearch = new String[variables.size()];
- for (int i = 0; i < variables.size(); i++) {
- varNamesToSearch[i] = variables.get(i).getName();
- }
-
+ if (varNamesToSearch != null) {
try {
performNewSearch(varNamesToSearch, project);
} catch (JavaModelException jme) {
@@ -163,7 +136,8 @@
if ("java".equalsIgnoreCase(file.getFileExtension())) { //$NON-NLS-1$
return;
}
- ElVarSearcher varSearcher = new ElVarSearcher(seamProject, file, engine);
+
+ ElVarSearcher varSearcher = new ElVarSearcher(seamProject, file, new SeamELCompletionEngine());
List<Var> allVars = ElVarSearcher.findAllVars(viewer, selectionOffset);
if (allVars == null || allVars.size() == 0)
return;
@@ -194,7 +168,42 @@
}
}
+ private String[] findVariableNames(ISeamProject seamProject, IDocument document, List<ELOperandToken> tokens, int elStartOffset) {
+ String[] varNames = null;
+
+ List<List<ELOperandToken>> variations = SeamELCompletionEngine.getPossibleVarsFromPrefix(tokens);
+
+ // Define the Seam project variables to search for declarations
+ List<ISeamContextVariable> variables = new ArrayList<ISeamContextVariable>();
+
+ for (List<ELOperandToken> variation : variations) {
+ try {
+ int start = variation.get(0).getStart();
+ int end = variation.get(variation.size() - 1).getStart() +
+ variation.get(variation.size() - 1).getLength();
+ String variationText = document.get(start, end - start);
+
+ Set<ISeamContextVariable> vars = seamProject.getVariablesByName(variationText);
+ if (vars != null)
+ variables.addAll(vars);
+
+ } catch (BadLocationException e1) {
+ SeamGuiPlugin.getPluginLog().logError(e1);
+ }
+ }
+
+ if (variables.size() != 0) {
+ // Some variable/variables are found - perform search for their declarations
+ varNames = new String[variables.size()];
+ for (int i = 0; i < variables.size(); i++) {
+ varNames[i] = variables.get(i).getName();
+ }
+ }
+
+ return varNames;
+ }
+
// ---- IWorkbenchWindowActionDelegate
// ------------------------------------------------
16 years, 6 months
JBoss Tools SVN: r6938 - trunk/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/common/kb.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2008-03-14 13:01:38 -0400 (Fri, 14 Mar 2008)
New Revision: 6938
Modified:
trunk/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/common/kb/KbTldStore.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1902
Modified: trunk/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/common/kb/KbTldStore.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/common/kb/KbTldStore.java 2008-03-14 16:58:03 UTC (rev 6937)
+++ trunk/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/common/kb/KbTldStore.java 2008-03-14 17:01:38 UTC (rev 6938)
@@ -14,6 +14,7 @@
import java.io.File;
import java.io.FileFilter;
import java.io.FileOutputStream;
+import java.io.IOException;
import java.io.StringWriter;
import java.util.ArrayList;
import java.util.Collection;
@@ -26,6 +27,7 @@
import org.apache.xml.serialize.OutputFormat;
import org.apache.xml.serialize.XMLSerializer;
+import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtension;
import org.eclipse.core.runtime.IExtensionPoint;
@@ -33,15 +35,14 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
+import org.jboss.tools.common.kb.configuration.KbConfigurationFactory;
+import org.osgi.framework.Bundle;
import org.w3c.dom.CDATASection;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import org.jboss.tools.common.reporting.ProblemReportingHelper;
-import org.jboss.tools.common.kb.configuration.KbConfigurationFactory;
-
/**
* Describes store whish contains all TLD schemas.
* @author eskimo
@@ -605,36 +606,40 @@
private void loadRegistratedResources() {
// Get the schemas from extention point.
- File kbPluginLocation = KbPlugin.getDefault().getLocation();
- if(kbPluginLocation!=null) {
- IExtensionRegistry registry = Platform.getExtensionRegistry();
- IExtensionPoint extensionPoint = registry.getExtensionPoint("org.jboss.tools.common.kb.tldResource");
- IExtension[] extensions = extensionPoint.getExtensions();
- for (int i=0; i<extensions.length; i++) {
- IExtension extension = extensions[i];
- IConfigurationElement[] elements = extension.getConfigurationElements();
- for(int j=0; j<elements.length; j++) {
- String uri = elements[j].getAttribute("uri");
- String location = elements[j].getAttribute("schema-location");
- String version = elements[j].getAttribute("version");
- String jsf = elements[j].getAttribute("jsf");
- if(uri==null || uri.length()==0 || location==null || location.length()==0) {
- continue;
+ IExtensionRegistry registry = Platform.getExtensionRegistry();
+ IExtensionPoint extensionPoint = registry.getExtensionPoint("org.jboss.tools.common.kb.tldResource");
+ IExtension[] extensions = extensionPoint.getExtensions();
+ for (int i=0; i<extensions.length; i++) {
+ IExtension extension = extensions[i];
+ IConfigurationElement[] elements = extension.getConfigurationElements();
+ for(int j=0; j<elements.length; j++) {
+ String uri = elements[j].getAttribute("uri");
+ String location = elements[j].getAttribute("schema-location");
+ String version = elements[j].getAttribute("version");
+ String jsf = elements[j].getAttribute("jsf");
+ if(uri==null || uri.length()==0 || location==null || location.length()==0) {
+ continue;
+ }
+ Bundle sourcePlugin = Platform.getBundle(elements[j].getNamespaceIdentifier());
+ File shemaLocation = null;
+ try {
+ shemaLocation = new File(FileLocator.resolve(sourcePlugin.getEntry("/")).getPath(), location);
+ } catch (IOException e) {
+ KbPlugin.getPluginLog().logError(e);
+ continue;
+ }
+ if(shemaLocation.isFile()) {
+ KbTldResource resource = new KbTldResource(uri, null, null, null);
+ resource.setSchemaLocation(shemaLocation);
+ if(version!=null && version.length()>0) {
+ resource.setVersion(version);
}
- File shemaLocation = new File(kbPluginLocation, location);
- if(shemaLocation.isFile()) {
- KbTldResource resource = new KbTldResource(uri, null, null, null);
- resource.setSchemaLocation(shemaLocation);
- if(version!=null && version.length()>0) {
- resource.setVersion(version);
- }
- resource.setCustomTld(false);
- resource.setJsfResource("true".equals(jsf));
- registratedResources.put(resource, resource);
- } else {
- String message = "Can't load KB schema: " + shemaLocation;
- KbPlugin.getDefault().getLog().log(new Status(IStatus.WARNING, KbPlugin.PLUGIN_ID, IStatus.WARNING, message, null));
- }
+ resource.setCustomTld(false);
+ resource.setJsfResource("true".equals(jsf));
+ registratedResources.put(resource, resource);
+ } else {
+ String message = "Can't load KB schema: " + shemaLocation;
+ KbPlugin.getDefault().getLog().log(new Status(IStatus.WARNING, KbPlugin.PLUGIN_ID, IStatus.WARNING, message, null));
}
}
}
16 years, 6 months