rpms/eclipse-quickrex/devel build.properties, NONE, 1.1 eclipse-quickrex.spec, NONE, 1.1 feature.xml, NONE, 1.1 fetch-quickrex.sh, NONE, 1.1 quickrex-disable-jregex-capability.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Alphonse Van Assche (alcapcom) fedora-extras-commits at redhat.com
Thu Aug 2 20:15:49 UTC 2007


Author: alcapcom

Update of /cvs/pkgs/rpms/eclipse-quickrex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26857/devel

Modified Files:
	.cvsignore sources 
Added Files:
	build.properties eclipse-quickrex.spec feature.xml 
	fetch-quickrex.sh quickrex-disable-jregex-capability.patch 
Log Message:
initial import


--- NEW FILE build.properties ---
bin.includes = feature.xml,\
               build.properties,\
               epl-v10.html
src.includes = feature.xml,\
               build.properties,\
               epl-v10.html,\
               .project


--- NEW FILE eclipse-quickrex.spec ---
%define gcj_support         1
%define eclipse_base        %{_datadir}/eclipse
%define upstream_name       QuickREx
%define cvs_tag             QuickREx_3_5_0
%define oro_jar             jakarta-oro-2.0.8.jar
%define regexp_jar          jakarta-regexp-1.4.jar

Name:           eclipse-quickrex
Version:        3.5.0
Release:        3%{?dist}
Summary:        %{upstream_name} is a regular-expression test Eclipse Plug-In

Group:          Development/Tools
License:        Eclipse Public License
URL:            http://www.bastian-bergerhoff.com/eclipse/features/web/QuickREx/toc.html
# This tarball was made using the included script, like so:
#   sh ./fetch-quickrex.sh %{cvs_tag}
Source0:        quickrex-fetched-src-%{cvs_tag}.tar.bz2
Source1:        fetch-quickrex.sh
# build.properties and feature.xml was create to easily build this plugin with
# the awesome Fedora way, these files are licensed under the same license as
# the package.
Source2:        build.properties
Source3:        feature.xml
# This patch disables jregex support due to the fact that there isn't a Fedora
# package of it.
Patch0:         quickrex-disable-jregex-capability.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%if %{gcj_support}
BuildRequires:    gcc-java
BuildRequires:    java-gcj-compat-devel
Requires(post):   java-gcj-compat
Requires(postun): java-gcj-compat
%else
BuildRequires:    java-devel >= 1.5.0
%endif
%if ! %{gcj_support}
BuildArch: noarch
%endif

BuildRequires: eclipse-pde >= 1:3.2.0
Requires: eclipse-platform >= 3.2.1 
BuildRequires: jakarta-oro
Requires: jakarta-oro
BuildRequires: regexp
Requires: regexp
Provides: eclipse-%{upstream_name} = %{version}-%{release}

%description
%{upstream_name} provides an Eclipse view in which you can enter
test-texts and try regular expressions.

# Note: This version of QuickREx disables jregex support due to
# the fact that there isn't a Fedora package of it.

%prep
%setup -q -n quickrex-fetched-src-%{cvs_tag}

mkdir quickrex-features
# create the feature plugin
cp -p %{SOURCE2} %{SOURCE3} quickrex-features

pushd Plug-In
%patch0 -p0
pushd lib
ln -s %{_javadir}/%{oro_jar}
ln -s %{_javadir}/regexp.jar %{regexp_jar}
popd
popd

# See comments in the script to understand this.
/bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK %{eclipse_base}
mkdir home

%build
SDK=$(cd SDK > /dev/null && pwd)

# Eclipse may try to write to the home directory.
homedir=$(cd home > /dev/null && pwd)

eclipse \
     -nosplash                                         \
     -application org.eclipse.ant.core.antRunner       \
     -Dtype=feature                                    \
     -Did=de.babe.eclipse.plugins.QuickREx             \
     -DbaseLocation=$SDK                               \
     -DsourceDirectory=$(pwd)                          \
     -DbuildDirectory=$(pwd)/build                     \
     -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build \
     -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml \
     -vmargs -Duser.home=$homedir \

%install
rm -rf %{buildroot}
install -d -m 755 %{buildroot}%{eclipse_base}
unzip -q -d %{buildroot}%{eclipse_base}/.. \
 build/rpmBuild/de.babe.eclipse.plugins.QuickREx.zip

# Re-symlink
pushd  %{buildroot}/%{eclipse_base}/plugins/de.babe.eclipse.plugins.QuickREx_%{version}/lib
rm %{oro_jar}
rm %{regexp_jar}
ln -s %{_javadir}/%{oro_jar}
ln -s %{_javadir}/regexp.jar %{regexp_jar}
popd

%if %{gcj_support}
%{_bindir}/aot-compile-rpm
%endif

%clean
rm -rf %{buildroot}

%if %{gcj_support}
%post
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi

%postun
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi
%endif

%files
%defattr(-,root,root,-)
%dir %{eclipse_base}/plugins/de.babe.eclipse.plugins.QuickREx_%{version}
%doc %{eclipse_base}/plugins/de.babe.eclipse.plugins.QuickREx_%{version}/html
%{eclipse_base}/features/de.babe.eclipse.plugins.QuickREx_%{version}
%{eclipse_base}/plugins/de.babe.eclipse.plugins.QuickREx_%{version}/*
%if %{gcj_support}
%dir %{_libdir}/gcj/%{name}
%{_libdir}/gcj/%{name}/%{upstream_name}.*
%endif

%changelog
* Wed Jul 11 2007 Alphonse Van Assche <alcapcom at gmail.com> 3.5.0-3
- Some other changes suggested by Andrew, see #246138 for more details

* Thu Jul 5 2007 Alphonse Van Assche <alcapcom at gmail.com> 3.5.0-2
- Some fixes suggested by Andrew Overholt, see #246138 for more details 

* Tue Jun 26 2007 Alphonse Van Assche <alcapcom at gmail.com> 3.5.0-1
- initial package.


--- NEW FILE feature.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<feature
      id="de.babe.eclipse.plugins.QuickREx"
      label="QuickREx Feature"
      version="3.5.0"
      provider-name="Bastian Bergerhoff (info at bastian-bergerhoff.com)">

   <description url="http://www.bastian-bergerhoff.com/eclipse/features/web/QuickREx/toc.html">
      QuickREx gives you a view in which you can enter test-texts and
try regular
expressions.The expressions are evaluated against the test-text
on the fly,
matches are highlighted and you can navigate between the matches.
You can also navigate through groups within each match (if groups
are defined
in your regular expression). Regular Expressions are edited either
within the
view or within a composition-dialog which offers the most useful
building-blocks grouped in categories and accompanied by short
explanations.
   </description>

   <copyright>
      Copyright (c) 2005, 2007 Bastian Bergerhoff and others
   </copyright>

   <license url="http://www.eclipse.org/legal/epl-v10.html">
      Eclipse Public License - v 1.0
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.
1. DEFINITIONS
"Contribution" means:
a) in the case of the initial Contributor, the initial code and
documentation distributed under this Agreement, and
b) in the case of each subsequent Contributor:
i) changes to the Program, and
ii) additions to the Program;
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.
"Contributor" means any person or entity that distributes the
Program.
"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.
"Program" means the Contributions distributed in accordance with
this Agreement.
"Recipient" means anyone who receives the Program under this
Agreement, including all Contributors.
2. GRANT OF RIGHTS
a) Subject to the terms of this Agreement, each Contributor hereby
grants Recipient a non-exclusive, worldwide, royalty-free copyright
license to 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.
b) Subject to the terms of this Agreement, each Contributor hereby
grants Recipient a non-exclusive, worldwide, 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.
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.
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.
3. REQUIREMENTS
A Contributor may choose to distribute the Program in object
code form under its own license agreement, provided that:
a) it complies with the terms and conditions of this Agreement;
and
b) its license agreement:
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;
ii) effectively excludes on behalf of all Contributors all liability
for damages, including direct, indirect, special, incidental
and consequential damages, such as lost profits;
iii) states that any provisions which differ from this Agreement
are offered by that Contributor alone and not by any other party;
and
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.
When the Program is made available in source code form:
a) it must be made available under this Agreement; and
b) a copy of this Agreement must be included with each copy of
the Program.
Contributors may not remove or alter any copyright notices contained
within the Program.
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.
4. COMMERCIAL DISTRIBUTION
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.
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.
5. NO WARRANTY
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.
6. DISCLAIMER OF LIABILITY
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.
7. GENERAL
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.
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.
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.
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.
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.
   </license>

   <url>
      <update label="QuickREx Update Site" url="http://www.bastian-bergerhoff.com/eclipse/features"/>
      <discovery label="Bastian Bergerhoff Eclipse Plugins Site" url="http://www.bastian-bergerhoff.com/eclipse/features/"/>
   </url>

   <requires>
      <import plugin="org.eclipse.ui"/>
      <import plugin="org.eclipse.core.runtime"/>
      <import plugin="org.eclipse.jface.text"/>
      <import plugin="org.eclipse.ui.workbench.texteditor"/>
      <import plugin="org.eclipse.ui.forms"/>
      <import plugin="org.eclipse.search"/>
   </requires>

   <plugin
         id="de.babe.eclipse.plugins.QuickREx"
         download-size="0"
         install-size="0"
         version="0.0.0"/>

</feature>


--- NEW FILE fetch-quickrex.sh ---
#!/bin/sh
name=quickrex

# Usage message
usage="usage: $0 <cvs_tag>"

tag=$1
tar_name=$name-fetched-src-$tag

# Ensure we got the desired CVS tag
if [ "x$tag"x = "xx" ]
then
        echo >&2 "$usage"
        exit 1
fi

cvs -q -z3 -d:pserver:anonymous at quickrex.cvs.sourceforge.net:/cvsroot/quickrex export -r $tag Plug-In
#cvs -q -z3 -d:pserver:anonymous at quickrex.cvs.sourceforge.net:/cvsroot/quickrex co -P I18N

# remove unneeded files
rm -frv Plug-In/*.zip Plug-In/*.jar Plug-In/lib/*.jar
# remove unneded files
#rm -frv I18N/*.zip

# cleanup dir
rm -fr $tar_name
# prepare archive
mkdir $tar_name
mv -v Plug-In $tar_name
# create archive
tar -cjf $tar_name.tar.bz2 $tar_name


quickrex-disable-jregex-capability.patch:

--- NEW FILE quickrex-disable-jregex-capability.patch ---
### Eclipse Workspace Patch 1.0
# By Alphonse Van Assche
# This patch disables jregex support due to the fact that there isn't a Fedora package of it.

#P Plug-In
Index: src/de/babe/eclipse/plugins/quickREx/views/QuickRExView.java
===================================================================
RCS file: /cvsroot/quickrex/Plug-In/src/de/babe/eclipse/plugins/quickREx/views/QuickRExView.java,v
retrieving revision 1.2
diff -u -r1.2 QuickRExView.java
--- src/de/babe/eclipse/plugins/quickREx/views/QuickRExView.java	28 May 2007 12:29:17 -0000	1.2
+++ src/de/babe/eclipse/plugins/quickREx/views/QuickRExView.java	4 Jul 2007 23:46:41 -0000
@@ -78,7 +78,6 @@
 import de.babe.eclipse.plugins.quickREx.actions.OrganizeTestTextsAction;
 import de.babe.eclipse.plugins.quickREx.actions.SaveTestTextAction;
 import de.babe.eclipse.plugins.quickREx.actions.UseJDKREAction;
-import de.babe.eclipse.plugins.quickREx.actions.UseJRegexAction;
 import de.babe.eclipse.plugins.quickREx.actions.UseJakartaRegexpAction;
 import de.babe.eclipse.plugins.quickREx.actions.UseOROAwkREAction;
 import de.babe.eclipse.plugins.quickREx.actions.UseOROPerlREAction;
@@ -149,8 +148,6 @@
 
   private Action useOROAWKAction;
   
-  private Action useJRegexAction;
-  
   private Action useJakartaRegexpAction;
   
   private Collection currentFlags = new Vector();
@@ -289,7 +286,6 @@
     createFlagFlavourSection(tk, client, layout, gd, Messages.getString("views.QuickRExView.jdk.flags"), MatchSetFactory.JAVA_FLAVOUR); //$NON-NLS-1$
     createFlagFlavourSection(tk, client, layout, gd, Messages.getString("views.QuickRExView.perl.flags"), MatchSetFactory.ORO_PERL_FLAVOUR); //$NON-NLS-1$
     createFlagFlavourSection(tk, client, layout, gd, Messages.getString("views.QuickRExView.awk.flags"), MatchSetFactory.ORO_AWK_FLAVOUR); //$NON-NLS-1$
-    createFlagFlavourSection(tk, client, layout, gd, Messages.getString("views.QuickRExView.jregex.flags"), MatchSetFactory.JREGEX_FLAVOUR); //$NON-NLS-1$
     createFlagFlavourSection(tk, client, layout, gd, Messages.getString("views.QuickRExView.jakartaRegexp.flags"), MatchSetFactory.JAKARTA_REGEXP_FLAVOUR); //$NON-NLS-1$
 
     section.setClient(client);
@@ -581,8 +577,6 @@
 
     useOROAWKAction = new UseOROAwkREAction();
 
-    useJRegexAction = new UseJRegexAction();
-    
     useJakartaRegexpAction = new UseJakartaRegexpAction();
     
     keepREAction = new KeepREAction();
@@ -607,7 +601,6 @@
     manager.add(useJDKREAction);
     manager.add(useOROPerlREAction);
     manager.add(useOROAWKAction);
-    manager.add(useJRegexAction);
     manager.add(useJakartaRegexpAction);
     manager.add(new Separator("UseRESeparator")); //$NON-NLS-1$
     manager.add(jcopyAction);
@@ -622,7 +615,6 @@
     manager.add(useJDKREAction);
     manager.add(useOROPerlREAction);
     manager.add(useOROAWKAction);
-    manager.add(useJRegexAction);
     manager.add(useJakartaRegexpAction);
     manager.add(new Separator("UseRESeparator")); //$NON-NLS-1$
     manager.add(jcopyAction);
@@ -696,19 +688,6 @@
   }
   
   /**
-   * Sets the RE-flavour to be the JRegex-one and triggers a re-evaluation
-   */
-  public void setUseJRegex() {
-    QuickRExPlugin.getDefault().useJRegex();
-    // This is a hack since there is no direct way of getting rid of the
-    // completion-proposal popup...
-    String oldRegExp = regExpCombo.getText();
-    regExpCombo.setText(oldRegExp + " "); //$NON-NLS-1$
-    regExpCombo.setText(oldRegExp);
-    updateEvaluation();
-  }
-
-  /**
    * Sets the RE-flavour to be the Jakarta-Regexp-one and triggers a re-evaluation
    */
   public void setUseJakartaRegexp() {
Index: src/de/babe/eclipse/plugins/quickREx/regexp/RegularExpressionHits.java
===================================================================
RCS file: /cvsroot/quickrex/Plug-In/src/de/babe/eclipse/plugins/quickREx/regexp/RegularExpressionHits.java,v
retrieving revision 1.1
diff -u -r1.1 RegularExpressionHits.java
--- src/de/babe/eclipse/plugins/quickREx/regexp/RegularExpressionHits.java	5 Nov 2006 19:53:27 -0000	1.1
+++ src/de/babe/eclipse/plugins/quickREx/regexp/RegularExpressionHits.java	4 Jul 2007 23:46:38 -0000
@@ -17,7 +17,6 @@
 import java.util.Vector;
 
 import de.babe.eclipse.plugins.quickREx.QuickRExPlugin;
-import de.babe.eclipse.plugins.quickREx.regexp.jregex.JRegexMatchSet;
 
 /**
  * @author bastian.bergerhoff, georg.sendt
@@ -44,20 +43,7 @@
     while (matches.nextMatch()) {
       Match match = new Match(matches.start(), matches.end(), matches.groupContents(0));
       for (int g = 0; g < matches.groupCount(); g++) {
-        try {
-          if(MatchSetFactory.JREGEX_FLAVOUR == QuickRExPlugin.getDefault().getREFlavour()) {
-            JRegexMatchSet jrMatcher = (JRegexMatchSet)matches;
-            String groupContent = matches.groupContents(g + 1);
-            if(groupContent != null) {            
-              match.addGroup(new Group(g + 1, jrMatcher.getGroupID(g + 1), groupContent, matches.groupStart(g + 1), matches.groupEnd(g + 1)));
-            }
-          } else {
-            match.addGroup(new Group(g + 1, matches.groupContents(g + 1), matches.groupStart(g + 1), matches.groupEnd(g + 1)));
-          }
-        } catch (StringIndexOutOfBoundsException soob) {
-          // this happens for the ORO-implementation if the pattern has a group with occurrences 0..* or 0..1 such as in (abc)?
-          // nop
-        }
+    	  match.addGroup(new Group(g + 1, matches.groupContents(g + 1), matches.groupStart(g + 1), matches.groupEnd(g + 1)));
       }
       matchData.add(match);
     }
Index: src/de/babe/eclipse/plugins/quickREx/regexp/MatchSetFactory.java
===================================================================
RCS file: /cvsroot/quickrex/Plug-In/src/de/babe/eclipse/plugins/quickREx/regexp/MatchSetFactory.java,v
retrieving revision 1.1
diff -u -r1.1 MatchSetFactory.java
--- src/de/babe/eclipse/plugins/quickREx/regexp/MatchSetFactory.java	5 Nov 2006 19:53:27 -0000	1.1
+++ src/de/babe/eclipse/plugins/quickREx/regexp/MatchSetFactory.java	4 Jul 2007 23:46:37 -0000
@@ -17,7 +17,6 @@
 import de.babe.eclipse.plugins.quickREx.Messages;
 import de.babe.eclipse.plugins.quickREx.regexp.jakartaRegexp.JakartaRegexpMatchSet;
 import de.babe.eclipse.plugins.quickREx.regexp.jdk.JavaMatchSet;
-import de.babe.eclipse.plugins.quickREx.regexp.jregex.JRegexMatchSet;
 import de.babe.eclipse.plugins.quickREx.regexp.oro.awk.OROAwkMatchSet;
 import de.babe.eclipse.plugins.quickREx.regexp.oro.perl.OROPerlMatchSet;
 
@@ -32,8 +31,6 @@
 
   public static final int ORO_AWK_FLAVOUR = 4;
   
-  public static final int JREGEX_FLAVOUR = 8;
-  
   public static final int JAKARTA_REGEXP_FLAVOUR = 16;
 
   /**
@@ -60,8 +57,6 @@
       return new OROPerlMatchSet(regExp, text, flavourFlags);
     case ORO_AWK_FLAVOUR:
       return new OROAwkMatchSet(regExp, text, flavourFlags);
-    case JREGEX_FLAVOUR:
-      return new JRegexMatchSet(regExp, text, flavourFlags);
     case JAKARTA_REGEXP_FLAVOUR:
       return new JakartaRegexpMatchSet(regExp, text, flavourFlags);
     default:
@@ -85,8 +80,6 @@
       return OROPerlMatchSet.getAllFlags();
     case ORO_AWK_FLAVOUR:
       return OROAwkMatchSet.getAllFlags();
-    case JREGEX_FLAVOUR:
-      return JRegexMatchSet.getAllFlags();
     case JAKARTA_REGEXP_FLAVOUR:
       return JakartaRegexpMatchSet.getAllFlags();
     default:
@@ -104,7 +97,6 @@
     allFlags.addAll(MatchSetFactory.getAllFlags(JAVA_FLAVOUR));
     allFlags.addAll(MatchSetFactory.getAllFlags(ORO_PERL_FLAVOUR));
     allFlags.addAll(MatchSetFactory.getAllFlags(ORO_AWK_FLAVOUR));
-    allFlags.addAll(MatchSetFactory.getAllFlags(JREGEX_FLAVOUR));
     allFlags.addAll(MatchSetFactory.getAllFlags(JAKARTA_REGEXP_FLAVOUR));
     return allFlags;
   }
Index: src/de/babe/eclipse/plugins/quickREx/regexp/RegExpContentAssistProcessor.java
===================================================================
RCS file: /cvsroot/quickrex/Plug-In/src/de/babe/eclipse/plugins/quickREx/regexp/RegExpContentAssistProcessor.java,v
retrieving revision 1.2
diff -u -r1.2 RegExpContentAssistProcessor.java
--- src/de/babe/eclipse/plugins/quickREx/regexp/RegExpContentAssistProcessor.java	28 May 2007 12:29:13 -0000	1.2
+++ src/de/babe/eclipse/plugins/quickREx/regexp/RegExpContentAssistProcessor.java	4 Jul 2007 23:46:37 -0000
@@ -107,8 +107,6 @@
       iter = proposals.getKeys(MatchSetFactory.ORO_PERL_FLAVOUR).iterator();
     } else if (QuickRExPlugin.getDefault().isUsingOROAwkRE()) {
       iter = proposals.getKeys(MatchSetFactory.ORO_AWK_FLAVOUR).iterator();
-    } else if (QuickRExPlugin.getDefault().isUsingJRegex()) {
-      iter = proposals.getKeys(MatchSetFactory.JREGEX_FLAVOUR).iterator();
     } else if (QuickRExPlugin.getDefault().isUsingJakartaRegexp()) {
       iter = proposals.getKeys(MatchSetFactory.JAKARTA_REGEXP_FLAVOUR).iterator();
     } else {
@@ -155,8 +153,6 @@
       proposal = proposals.getProposal(MatchSetFactory.ORO_PERL_FLAVOUR, proposalKey);
     } else if (QuickRExPlugin.getDefault().isUsingOROAwkRE()) {
       proposal = proposals.getProposal(MatchSetFactory.ORO_AWK_FLAVOUR, proposalKey);
-    } else if (QuickRExPlugin.getDefault().isUsingJRegex()) {
-      proposal = proposals.getProposal(MatchSetFactory.JREGEX_FLAVOUR, proposalKey);
     } else if (QuickRExPlugin.getDefault().isUsingJakartaRegexp()) {
       proposal = proposals.getProposal(MatchSetFactory.JAKARTA_REGEXP_FLAVOUR, proposalKey);
     } 
Index: src/de/babe/eclipse/plugins/quickREx/regexp/jregex/JRegexFlag.java
===================================================================
RCS file: src/de/babe/eclipse/plugins/quickREx/regexp/jregex/JRegexFlag.java
diff -N src/de/babe/eclipse/plugins/quickREx/regexp/jregex/JRegexFlag.java
--- src/de/babe/eclipse/plugins/quickREx/regexp/jregex/JRegexFlag.java	28 May 2007 12:29:18 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 Bastian Bergerhoff 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.
- * 
- * Contributors:
- *     Georg Sendt - initial API and implementation
- *     Bastian Bergerhoff - some minor cleanup
- *******************************************************************************/
-package de.babe.eclipse.plugins.quickREx.regexp.jregex;
-
-import jregex.REFlags;
-import de.babe.eclipse.plugins.quickREx.Messages;
-import de.babe.eclipse.plugins.quickREx.regexp.Flag;
-
-/**
- * Class JavaFlag. This represents all flags for the JRegex implementation.
- * 
- * @author Georg Sendt, Bastian Bergerhoff
- * @version 1.1
- * @since 3.5
- */
-public class JRegexFlag extends Flag {
-  
-  /**
-   * Pattern "a" matches both "a" and "A".
-   * Corresponds to "i" in Perl notation.
-   */
-  public static final Flag RE_IGNORE_CASE = new JRegexFlag(
-      "de.babe.eclipse.plugins.quickREx.regexp.jregex.IGNORE_CASE", REFlags.IGNORE_CASE, Messages.getString("regexp.jregex.REFlag.ignore_case"), //$NON-NLS-1$ //$NON-NLS-2$
-      Messages.getString("regexp.jregex.REFlag.ignore_case.description")); //$NON-NLS-1$
-
-  /**
-   * Affects the behaviour of "^" and "$" tags. When switched off:
-   * <li> the "^" matches the beginning of the whole text;
-   * <li> the "$" matches the end of the whole text, or just before the '\n' or "\r\n" at the end of text.
-   * When switched on:
-   * <li> the "^" additionally matches the line beginnings (that is just after the '\n');
-   * <li> the "$" additionally matches the line ends (that is just before "\r\n" or '\n');
-   * Corresponds to "m" in Perl notation.
-   */
-  public static final Flag RE_MULTILINE = new JRegexFlag(
-      "de.babe.eclipse.plugins.quickREx.regexp.jregex.MULTILINE", REFlags.MULTILINE, Messages.getString("regexp.jregex.REFlag.multiline"), //$NON-NLS-1$ //$NON-NLS-2$
-      Messages.getString("regexp.jregex.REFlag.multiline.description")); //$NON-NLS-1$
-
-
-  /**
-   * Affects the behaviour of dot(".") tag. When switched off:
-   * <li> the dot matches any character but EOLs('\r','\n');
-   * When switched on:
-   * <li> the dot matches any character, including EOLs.
-   * This flag is sometimes referenced in regex tutorials as SINGLELINE, which confusingly seems opposite to MULTILINE, but in fact is orthogonal.
-   * Corresponds to "s" in Perl notation.
-   */
-  public static final Flag RE_DOTALL = new JRegexFlag(
-      "de.babe.eclipse.plugins.quickREx.regexp.jregex.DOTALL", REFlags.DOTALL, Messages.getString("regexp.jregex.REFlag.dotall"), //$NON-NLS-1$ //$NON-NLS-2$
-      Messages.getString("regexp.jregex.REFlag.dotall.description")); //$NON-NLS-1$
-
-  /**
-   * Affects how the space characters are interpeted in the expression. When switched off:
-   * <li> the spaces are interpreted literally;
-   * When switched on:
-   * <li> the spaces are ingnored, allowing an expression to be slightly more readable.
-   * Corresponds to "x" in Perl notation.
-   */
-  public static final Flag RE_IGNORE_SPACES = new JRegexFlag(
-      "de.babe.eclipse.plugins.quickREx.regexp.jregex.IGNORE_SPACES", REFlags.IGNORE_SPACES, Messages.getString("regexp.jregex.REFlag.ignore_spaces"), //$NON-NLS-1$ //$NON-NLS-2$
-      Messages.getString("regexp.jregex.REFlag.ignore_spaces.description")); //$NON-NLS-1$
-  
-  /**
-   * Affects whether the predefined classes("\d","\s","\w",etc) in the expression are interpreted as belonging to Unicode. When switched off:
-   * <li> the predefined classes are interpreted as ASCII;
-   * When switched on:
-   * <li> the predefined classes are interpreted as Unicode categories;
-   */
-  public static final Flag RE_UNICODE = new JRegexFlag(
-      "de.babe.eclipse.plugins.quickREx.regexp.jregex.UNICODE", REFlags.UNICODE, Messages.getString("regexp.jregex.REFlag.unicode"), //$NON-NLS-1$ //$NON-NLS-2$
-      Messages.getString("regexp.jregex.REFlag.unicode.description")); //$NON-NLS-1$
-
-  /**
-   * Turns on the compatibility with XML Schema regular expressions.
-   */
-  public static final Flag RE_XML_SCHEMA = new JRegexFlag(
-      "de.babe.eclipse.plugins.quickREx.regexp.jregex.XML_SCHEMA", REFlags.XML_SCHEMA, Messages.getString("regexp.jregex.REFlag.xml_schema"), //$NON-NLS-1$ //$NON-NLS-2$
-      Messages.getString("regexp.jregex.REFlag.xml_schema.description")); //$NON-NLS-1$
-
-  static {
-    flags.put(RE_IGNORE_CASE.getCode(), RE_IGNORE_CASE);
-    flags.put(RE_MULTILINE.getCode(), RE_MULTILINE);
-    flags.put(RE_DOTALL.getCode(), RE_DOTALL);
-    flags.put(RE_IGNORE_SPACES.getCode(), RE_IGNORE_SPACES);
-    flags.put(RE_UNICODE.getCode(), RE_UNICODE);
-    flags.put(RE_XML_SCHEMA.getCode(), RE_XML_SCHEMA);
-  }
-
-  private JRegexFlag(String code, int flag, String name, String description) {
-    super(code, flag, name, description);
-  }
-}
\ No newline at end of file
Index: src/de/babe/eclipse/plugins/quickREx/regexp/jregex/JRegexMatchSet.java
===================================================================
RCS file: src/de/babe/eclipse/plugins/quickREx/regexp/jregex/JRegexMatchSet.java
diff -N src/de/babe/eclipse/plugins/quickREx/regexp/jregex/JRegexMatchSet.java
--- src/de/babe/eclipse/plugins/quickREx/regexp/jregex/JRegexMatchSet.java	5 Nov 2006 19:53:45 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Bastian Bergerhoff 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.
- * 
- * Contributors:
- *     Georg Sendt - initial API and implementation
- *******************************************************************************/
-package de.babe.eclipse.plugins.quickREx.regexp.jregex;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Vector;
-import java.util.regex.PatternSyntaxException;
-
-import jregex.Matcher;
-import jregex.Pattern;
-import de.babe.eclipse.plugins.quickREx.regexp.Flag;
-import de.babe.eclipse.plugins.quickREx.regexp.MatchSet;
-
-/**
- * MatchSet using JRegex-regular expressions.
- * 
- * @author georg.sendt
- */
-public class JRegexMatchSet implements MatchSet {
-
-  private final Pattern pattern;
-
-  private final Matcher matcher;
-
-  private final static Collection flags = new Vector();
-
-  static {
-    flags.add(JRegexFlag.RE_IGNORE_CASE);
-    flags.add(JRegexFlag.RE_MULTILINE);
-    flags.add(JRegexFlag.RE_DOTALL);
-    flags.add(JRegexFlag.RE_IGNORE_SPACES);
-    flags.add(JRegexFlag.RE_UNICODE);
-    flags.add(JRegexFlag.RE_XML_SCHEMA);
-  }
-
-  /**
-   * Returns a Collection of all Compiler-Flags the JRegex-implementation knows about.
-   * 
-   * @return a Collection of all Compiler-Flags the JRegex-implementation knows about
-   */
-  public static Collection getAllFlags() {
-    return flags;
-  }
-
-  /**
-   * The constructor - uses the JRegex regular expressions to evaluate the passed regular expression against the passed
-   * text.
-   * 
-   * @param regExp
-   *          the regular expression
-   * @param text
-   *          the text to evaluate regExp against
-   * @param flags
-   *          a Collection of Flags to pass to the Compiler
-   */
-  public JRegexMatchSet(String regExp, String text, Collection flags) {
-
-    try {
-      int iFlags = 0;
-      for (Iterator iter = flags.iterator(); iter.hasNext();) {
-        Flag element = (Flag) iter.next();
-        iFlags = iFlags | element.getFlag();
-      }
-      pattern = new Pattern(regExp, iFlags);
-      matcher = pattern.matcher(text);
-    } catch (Exception ex) {
-      if (ex instanceof PatternSyntaxException)
-        throw (PatternSyntaxException) ex;
-      else
-        throw new PatternSyntaxException(ex.getMessage(), regExp, 0);
-    }
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see de.babe.eclipse.plugins.quickREx.regexp.MatchSet#nextMatch()
-   */
-  public boolean nextMatch() {
-    return matcher.find();
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see de.babe.eclipse.plugins.quickREx.regexp.MatchSet#start()
-   */
-  public int start() {
-    return matcher.start();
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see de.babe.eclipse.plugins.quickREx.regexp.MatchSet#end()
-   */
-  public int end() {
-    return matcher.end();
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see de.babe.eclipse.plugins.quickREx.regexp.MatchSet#groupCount()
-   */
-  public int groupCount() {
-    return matcher.groupCount()-1;
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see de.babe.eclipse.plugins.quickREx.regexp.MatchSet#groupContents(int)
-   */
-  public String groupContents(int groupIndex) {
-    return matcher.group(groupIndex);
-  }
-
-  public String getGroup(String groupID) {
-    return matcher.group(groupID);
-  }
-
-  public String getGroupID(int groupIndex) {
-    return matcher.pattern().groupName(new Integer(groupIndex));
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see de.babe.eclipse.plugins.quickREx.regexp.MatchSet#groupStart(int)
-   */
-  public int groupStart(int groupIndex) {
-    return matcher.start(groupIndex);
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see de.babe.eclipse.plugins.quickREx.regexp.MatchSet#groupEnd(int)
-   */
-  public int groupEnd(int groupIndex) {
-    return matcher.end(groupIndex);
-  }
-
-  public boolean matches() {
-    return matcher.matches();
-  }
-}
Index: src/de/babe/eclipse/plugins/quickREx/actions/UseJRegexAction.java
===================================================================
RCS file: src/de/babe/eclipse/plugins/quickREx/actions/UseJRegexAction.java
diff -N src/de/babe/eclipse/plugins/quickREx/actions/UseJRegexAction.java
--- src/de/babe/eclipse/plugins/quickREx/actions/UseJRegexAction.java	28 May 2007 12:29:05 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 Bastian Bergerhoff 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.
- * 
- * Contributors:
- *     Bastian Bergerhoff - initial API and implementation
- *******************************************************************************/
-package de.babe.eclipse.plugins.quickREx.actions;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-
-import de.babe.eclipse.plugins.quickREx.Messages;
-import de.babe.eclipse.plugins.quickREx.PluginImageRegistry;
-import de.babe.eclipse.plugins.quickREx.QuickRExPlugin;
-import de.babe.eclipse.plugins.quickREx.views.QuickRExView;
-
-/**
- * @author bastian.bergerhoff
- */
-public class UseJRegexAction extends Action {
-
-  public UseJRegexAction() {
-		super("", IAction.AS_RADIO_BUTTON); //$NON-NLS-1$
-    this.setText(Messages.getString("views.QuickRExView.useJREGEXAction.text")); //$NON-NLS-1$
-    this.setToolTipText(Messages.getString("views.QuickRExView.useJREGEXAction.tooltip")); //$NON-NLS-1$
-    this.setChecked(QuickRExPlugin.getDefault().isUsingJRegex());
-    this.setImageDescriptor(((PluginImageRegistry)QuickRExPlugin.getDefault().getImageRegistry())
-        .getImageDescriptor(PluginImageRegistry.IMG_JREGEX_LOGO));
-    this.setId("de.babe.eclipse.plugins.quickREx.actions.UseJRegexAction"); //$NON-NLS-1$
-	}
-
-	public void run() {
-	    if (isChecked()) {
-    	  try {
-          ((QuickRExView)PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().showView(QuickRExView.ID)).setUseJRegex();
-        } catch (PartInitException e) {
-          // Bad luck...
-        }
-	    }
-	  }
-}
\ No newline at end of file
Index: src/de/babe/eclipse/plugins/quickREx/QuickRExPlugin.java
===================================================================
RCS file: /cvsroot/quickrex/Plug-In/src/de/babe/eclipse/plugins/quickREx/QuickRExPlugin.java,v
retrieving revision 1.2
diff -u -r1.2 QuickRExPlugin.java
--- src/de/babe/eclipse/plugins/quickREx/QuickRExPlugin.java	28 May 2007 12:29:18 -0000	1.2
+++ src/de/babe/eclipse/plugins/quickREx/QuickRExPlugin.java	4 Jul 2007 23:46:37 -0000
@@ -71,8 +71,6 @@
 
   private HashMap jdkCatMappings;
 
-  private HashMap jRegexCatMappings;
-
   private HashMap oroAwkCatMappings;
 
   private HashMap oroPerlCatMappings;
@@ -81,8 +79,6 @@
 
   private ArrayList jdkCategories;
 
-  private ArrayList jRegexCategories;
-
   private ArrayList oroAwkCategories;
 
   private ArrayList oroPerlCategories;
@@ -113,8 +109,6 @@
 
   private static final String JDK_PROPOSAL_FILE_NAME = "$nl$/jdkCompletion.xml"; //$NON-NLS-1$
   
-  private static final String JREGEX_PROPOSAL_FILE_NAME = "$nl$/jregexCompletion.xml"; //$NON-NLS-1$
-
   private static final String JAKARTA_REGEX_PROPOSAL_FILE_NAME = "$nl$/jakartaRegexpCompletion.xml"; //$NON-NLS-1$
 
   private static final String ORO_AWK_CATEGORIES_FILE_NAME = "$nl$/oroAwkCategories.xml"; //$NON-NLS-1$
@@ -123,8 +117,6 @@
 
   private static final String JDK_CATEGORIES_FILE_NAME = "$nl$/jdkCategories.xml"; //$NON-NLS-1$
   
-  private static final String JREGEX_CATEGORIES_FILE_NAME = "$nl$/jregexCategories.xml"; //$NON-NLS-1$
-
   private static final String JAKARTA_REGEX_CATEGORIES_FILE_NAME = "$nl$/jakartaRegexpCategories.xml"; //$NON-NLS-1$
 
   /**
@@ -173,11 +165,6 @@
     initCategoriesFromFile(jdkCatMappings, jdkCategories, MatchSetFactory.JAVA_FLAVOUR);
     addProposalsToMappings(jdkCategories, jdkCatMappings, MatchSetFactory.JAVA_FLAVOUR);
 
-    jRegexCategories = new ArrayList();
-    jRegexCatMappings = new HashMap();
-    initCategoriesFromFile(jRegexCatMappings, jRegexCategories, MatchSetFactory.JREGEX_FLAVOUR);
-    addProposalsToMappings(jRegexCategories, jRegexCatMappings, MatchSetFactory.JREGEX_FLAVOUR);
-
     oroAwkCategories = new ArrayList();
     oroAwkCatMappings = new HashMap();
     initCategoriesFromFile(oroAwkCatMappings, oroAwkCategories, MatchSetFactory.ORO_AWK_FLAVOUR);
@@ -639,15 +626,6 @@
   public boolean isUsingOROAwkRE() {
     return getREFlavour() == MatchSetFactory.ORO_AWK_FLAVOUR;
   }
-  
-  /**
-   * Returns <code>true</code> if and only if currently the JRegex-implementation of regular expressions is used.
-   * 
-   * @return <code>true</code> if and only if currently the JRegex-implementation of regular expressions is used
-   */
-  public boolean isUsingJRegex() {
-    return getREFlavour() == MatchSetFactory.JREGEX_FLAVOUR;
-  }
 
   /**
    * Returns <code>true</code> if and only if currently the Jakarta-Regexp-implementation of regular expressions is used.
@@ -698,13 +676,6 @@
   }
   
   /**
-   * Tells the Plugin to use the JRegex-implementation of regular expressions.
-   */
-  public void useJRegex() {
-    getPreferenceStore().setValue(RE_FLAVOUR, MatchSetFactory.JREGEX_FLAVOUR);
-  }
-
-  /**
    * Tells the Plugin to use the Jakarta-Regexp-implementation of regular expressions.
    */
   public void useJakartaRegexp() {
@@ -761,12 +732,6 @@
     proposals.setKeys(MatchSetFactory.ORO_AWK_FLAVOUR, oroAwkKeys);
     proposals.setProposals(MatchSetFactory.ORO_AWK_FLAVOUR, oroAwkProposals);
     
-    HashMap jRegexpProposals = new HashMap();
-    ArrayList jRegexpKeys = new ArrayList();
-    initCompletionsFromFile(jRegexpProposals, jRegexpKeys, MatchSetFactory.JREGEX_FLAVOUR);
-    proposals.setKeys(MatchSetFactory.JREGEX_FLAVOUR, jRegexpKeys);
-    proposals.setProposals(MatchSetFactory.JREGEX_FLAVOUR, jRegexpProposals);
-    
     HashMap jakartaProposals = new HashMap();
     ArrayList jakartaKeys = new ArrayList();
     initCompletionsFromFile(jakartaProposals, jakartaKeys, MatchSetFactory.JAKARTA_REGEXP_FLAVOUR);
@@ -786,10 +751,6 @@
         filepath = JDK_PROPOSAL_FILE_NAME;
         errorMsgKey = "QuickRExPlugin.error.message7"; //$NON-NLS-1$
         break;
-      case MatchSetFactory.JREGEX_FLAVOUR:
-        filepath = JREGEX_PROPOSAL_FILE_NAME;
-        errorMsgKey = "QuickRExPlugin.error.readerror.jregex.completion"; //$NON-NLS-1$
-        break;
       case MatchSetFactory.ORO_PERL_FLAVOUR:
         filepath = ORO_PERL_PROPOSAL_FILE_NAME;
         errorMsgKey = "QuickRExPlugin.error.message9"; //$NON-NLS-1$
@@ -824,10 +785,6 @@
         filepath = JDK_CATEGORIES_FILE_NAME;
         errorMsgKey = "QuickRExPlugin.error.readerror.jdk.categories"; //$NON-NLS-1$
         break;
-      case MatchSetFactory.JREGEX_FLAVOUR:
-        filepath = JREGEX_CATEGORIES_FILE_NAME;
-        errorMsgKey = "QuickRExPlugin.error.readerror.jregex.categories"; //$NON-NLS-1$
-        break;
       case MatchSetFactory.ORO_PERL_FLAVOUR:
         filepath = ORO_PERL_CATEGORIES_FILE_NAME;
         errorMsgKey = "QuickRExPlugin.error.readerror.oroperl.categories"; //$NON-NLS-1$
@@ -975,8 +932,6 @@
         return oroPerlCategories;
       case MatchSetFactory.ORO_AWK_FLAVOUR:
         return oroAwkCategories;
-      case MatchSetFactory.JREGEX_FLAVOUR:
-        return jRegexCategories;
       case MatchSetFactory.JAKARTA_REGEXP_FLAVOUR:
         return jakCategories;
       default:
@@ -1000,8 +955,6 @@
         return oroPerlCatMappings;
       case MatchSetFactory.ORO_AWK_FLAVOUR:
         return oroAwkCatMappings;
-      case MatchSetFactory.JREGEX_FLAVOUR:
-        return jRegexCatMappings;
       case MatchSetFactory.JAKARTA_REGEXP_FLAVOUR:
         return jakCatMappings;
       default:
Index: src/de/babe/eclipse/plugins/quickREx/PluginImageRegistry.java
===================================================================
RCS file: /cvsroot/quickrex/Plug-In/src/de/babe/eclipse/plugins/quickREx/PluginImageRegistry.java,v
retrieving revision 1.1
diff -u -r1.1 PluginImageRegistry.java
--- src/de/babe/eclipse/plugins/quickREx/PluginImageRegistry.java	5 Nov 2006 19:53:42 -0000	1.1
+++ src/de/babe/eclipse/plugins/quickREx/PluginImageRegistry.java	4 Jul 2007 23:46:34 -0000
@@ -37,8 +37,6 @@
 
   public static final String IMG_ORO_AWK_LOGO = "IMG_ORO_AWK_LOGO"; //$NON-NLS-1$
   
-  public static final String IMG_JREGEX_LOGO = "IMG_JREGEX_LOGO"; //$NON-NLS-1$
-
   public static final String IMG_JAKARTA_REGEXP_LOGO = "IMG_JAKARTA_REGEXP_LOGO"; //$NON-NLS-1$
 
   public static final String IMG_KEEP_RE = "IMG_KEEP_RE"; //$NON-NLS-1$
@@ -97,8 +95,7 @@
       put(IMG_JAVA_LOGO, ImageDescriptor.createFromURL(new URL(iconBaseURL, "JavalogoSmall.gif"))); //$NON-NLS-1$
       put(IMG_ORO_PERL_LOGO, ImageDescriptor.createFromURL(new URL(iconBaseURL, "OROPerllogoSmall.gif"))); //$NON-NLS-1$
       put(IMG_ORO_AWK_LOGO, ImageDescriptor.createFromURL(new URL(iconBaseURL, "OROAwklogoSmall.gif"))); //$NON-NLS-1$
-      put(IMG_JREGEX_LOGO, ImageDescriptor.createFromURL(new URL(iconBaseURL, "JRegexSmall.gif"))); //$NON-NLS-1$      
-      put(IMG_JAKARTA_REGEXP_LOGO, ImageDescriptor.createFromURL(new URL(iconBaseURL, "JakartaRegexpSmall.gif"))); //$NON-NLS-1$      
+       put(IMG_JAKARTA_REGEXP_LOGO, ImageDescriptor.createFromURL(new URL(iconBaseURL, "JakartaRegexpSmall.gif"))); //$NON-NLS-1$      
       put(IMG_KEEP_RE, ImageDescriptor.createFromURL(new URL(iconBaseURL, "saveRE.gif"))); //$NON-NLS-1$
       put(IMG_SAVE_TT, ImageDescriptor.createFromURL(new URL(iconBaseURL, "saveText.gif"))); //$NON-NLS-1$
       put(IMG_LOAD_TT, ImageDescriptor.createFromURL(new URL(iconBaseURL, "loadText.gif"))); //$NON-NLS-1$
Index: META-INF/MANIFEST.MF
===================================================================
RCS file: /cvsroot/quickrex/Plug-In/META-INF/MANIFEST.MF,v
retrieving revision 1.3
diff -u -r1.3 MANIFEST.MF
--- META-INF/MANIFEST.MF	28 May 2007 12:29:18 -0000	1.3
+++ META-INF/MANIFEST.MF	4 Jul 2007 23:46:34 -0000
@@ -14,7 +14,6 @@
  de.babe.eclipse.plugins.quickREx.objects,
  de.babe.eclipse.plugins.quickREx.regexp,
  de.babe.eclipse.plugins.quickREx.regexp.jdk,
- de.babe.eclipse.plugins.quickREx.regexp.jregex,
  de.babe.eclipse.plugins.quickREx.regexp.oro,
  de.babe.eclipse.plugins.quickREx.regexp.oro.awk,
  de.babe.eclipse.plugins.quickREx.regexp.oro.perl,
Index: .classpath
===================================================================
RCS file: /cvsroot/quickrex/Plug-In/.classpath,v
retrieving revision 1.1
diff -u -r1.1 .classpath
--- .classpath	5 Nov 2006 19:53:40 -0000	1.1
+++ .classpath	4 Jul 2007 23:46:34 -0000
@@ -4,7 +4,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="lib" path="lib/jakarta-oro-2.0.8.jar"/>
-	<classpathentry kind="lib" path="lib/jregex1.2_01.jar"/>
 	<classpathentry kind="lib" path="lib/jakarta-regexp-1.4.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-quickrex/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	2 Aug 2007 19:47:41 -0000	1.1
+++ .cvsignore	2 Aug 2007 20:15:17 -0000	1.2
@@ -0,0 +1 @@
+quickrex-fetched-src-QuickREx_3_5_0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-quickrex/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	2 Aug 2007 19:47:41 -0000	1.1
+++ sources	2 Aug 2007 20:15:17 -0000	1.2
@@ -0,0 +1 @@
+25ee4d1969cb28a6a3de54eaf1f5b8e3  quickrex-fetched-src-QuickREx_3_5_0.tar.bz2




More information about the fedora-extras-commits mailing list