[eclipse-wtp] 04/05: Refreshed patches

Jakub Adam xhaakon-guest at alioth.debian.org
Sun Sep 29 10:48:04 UTC 2013


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

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

commit db1006ee670995667143656b320fc24f75543682
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Sat Sep 28 22:28:09 2013 +0200

    Refreshed patches
---
 debian/changelog                                   |    3 +
 debian/patches/debian-custom-build.patch           |  458 +++++---------------
 .../patches/regenerate-js-parser-resources.patch   |   79 ++--
 3 files changed, 157 insertions(+), 383 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6b5493a..034212b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 eclipse-wtp (3.5.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Refreshed d/patches:
+    - debian-custom-build.patch
+    - regenerate-js-parser-resources.patch.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Sat, 28 Sep 2013 21:52:30 +0200
 
diff --git a/debian/patches/debian-custom-build.patch b/debian/patches/debian-custom-build.patch
index dea51eb..075add7 100644
--- a/debian/patches/debian-custom-build.patch
+++ b/debian/patches/debian-custom-build.patch
@@ -3,31 +3,31 @@ Date: Sat, 29 Sep 2012 20:14:43 +0200
 Subject: debian-custom-build
 
 ---
- .../META-INF/MANIFEST.MF                           |    2 +-
- org.eclipse.wst.jsdt.feature/feature.xml           |    2 +-
- .../feature.xml                                    |    4 +-
- org.eclipse.wst.server_ui.feature/feature.xml      |    8 +-
- org.eclipse.wst.web_core.feature/feature.xml       |   18 +-
- org.eclipse.wst.web_ui.feature/feature.xml         |   13 +-
- org.eclipse.wst.ws.explorer/META-INF/MANIFEST.MF   |    2 +-
- org.eclipse.wst.ws.parser/META-INF/MANIFEST.MF     |    2 +-
- org.eclipse.wst.ws/META-INF/MANIFEST.MF            |    2 +-
- org.eclipse.wst.ws_core.feature/feature.xml        |  300 ++++++++++----------
- org.eclipse.wst.ws_ui.feature/feature.xml          |    8 +-
- org.eclipse.wst.ws_wsdl15.feature/feature.xml      |    2 +-
- org.eclipse.wst.wsdl.ui/META-INF/MANIFEST.MF       |    2 +-
- .../META-INF/MANIFEST.MF                           |    2 +-
- org.eclipse.wst.wsdl/META-INF/MANIFEST.MF          |    2 +-
- org.eclipse.wst.wsi.ui/META-INF/MANIFEST.MF        |    2 +-
- org.eclipse.wst.wsi/META-INF/MANIFEST.MF           |    2 +-
- .../feature.xml                                    |    4 +-
- .../META-INF/MANIFEST.MF                           |    2 +-
- org.eclipse.wst.xml_core.feature/feature.xml       |   18 +-
- org.eclipse.wst.xml_ui.feature/feature.xml         |    6 +-
- org.eclipse.wst.xsl.feature/feature.xml            |   10 +-
- .../schema/processor.exsd                          |    2 +-
- org.eclipse.wst.xsl.xalan/plugin.xml               |    2 +-
- 24 files changed, 192 insertions(+), 225 deletions(-)
+ .../META-INF/MANIFEST.MF                           |  2 +-
+ org.eclipse.wst.jsdt.feature/feature.xml           |  2 +-
+ .../feature.xml                                    |  4 ++--
+ org.eclipse.wst.server_ui.feature/feature.xml      |  8 +++----
+ org.eclipse.wst.web_core.feature/feature.xml       | 18 +++++---------
+ org.eclipse.wst.web_ui.feature/feature.xml         | 13 ++++------
+ org.eclipse.wst.ws.explorer/META-INF/MANIFEST.MF   |  2 +-
+ org.eclipse.wst.ws.parser/META-INF/MANIFEST.MF     |  2 +-
+ org.eclipse.wst.ws/META-INF/MANIFEST.MF            |  2 +-
+ org.eclipse.wst.ws_core.feature/feature.xml        | 28 +++++++---------------
+ org.eclipse.wst.ws_ui.feature/feature.xml          |  8 +++----
+ org.eclipse.wst.ws_wsdl15.feature/feature.xml      |  2 +-
+ org.eclipse.wst.wsdl.ui/META-INF/MANIFEST.MF       |  2 +-
+ .../META-INF/MANIFEST.MF                           |  2 +-
+ org.eclipse.wst.wsdl/META-INF/MANIFEST.MF          |  2 +-
+ org.eclipse.wst.wsi.ui/META-INF/MANIFEST.MF        |  2 +-
+ org.eclipse.wst.wsi/META-INF/MANIFEST.MF           |  2 +-
+ .../feature.xml                                    |  4 ++--
+ .../META-INF/MANIFEST.MF                           |  2 +-
+ org.eclipse.wst.xml_core.feature/feature.xml       | 18 ++------------
+ org.eclipse.wst.xml_ui.feature/feature.xml         |  6 ++---
+ org.eclipse.wst.xsl.feature/feature.xml            | 10 ++++----
+ .../schema/processor.exsd                          |  2 +-
+ org.eclipse.wst.xsl.xalan/plugin.xml               |  2 +-
+ 24 files changed, 56 insertions(+), 89 deletions(-)
 
 diff --git a/org.eclipse.wst.jsdt.debug.rhino.ui/META-INF/MANIFEST.MF b/org.eclipse.wst.jsdt.debug.rhino.ui/META-INF/MANIFEST.MF
 index 90374a2..4712a18 100644
@@ -43,41 +43,41 @@ index 90374a2..4712a18 100644
   org.eclipse.wst.jsdt.ui
  Bundle-RequiredExecutionEnvironment: J2SE-1.4
 diff --git a/org.eclipse.wst.jsdt.feature/feature.xml b/org.eclipse.wst.jsdt.feature/feature.xml
-index 02045d6..a360ea8 100644
+index 1dab9e4..edcca5b 100644
 --- a/org.eclipse.wst.jsdt.feature/feature.xml
 +++ b/org.eclipse.wst.jsdt.feature/feature.xml
-@@ -109,7 +109,7 @@
-          id="org.mozilla.javascript"
-          download-size="0"
-          install-size="0"
--         version="1.7.2.qualifier"
-+         version="0.0.0"
-          unpack="false"/>
- 
-    <plugin
+@@ -108,7 +108,7 @@
+          id="org.mozilla.javascript"
+          download-size="0"
+          install-size="0"
+-         version="1.7.2.qualifier"
++         version="0.0.0"
+          unpack="false"/>
+ 
+    <plugin
 diff --git a/org.eclipse.wst.server_adapters.feature/feature.xml b/org.eclipse.wst.server_adapters.feature/feature.xml
-index 398528b..16e138f 100644
+index 870664d..7e98d0a 100644
 --- a/org.eclipse.wst.server_adapters.feature/feature.xml
 +++ b/org.eclipse.wst.server_adapters.feature/feature.xml
 @@ -51,14 +51,14 @@
- 		 id="org.eclipse.jetty.webapp"
-          download-size="0"
-          install-size="0"
--         version="8.1.3.qualifier"
-+         version="0.0.0"
-          unpack="false"/>
- 	
- 	<plugin
- 		 id="org.eclipse.jetty.xml"
-          download-size="0"
-          install-size="0"
--         version="8.1.3.qualifier"
-+         version="0.0.0"
-          unpack="false"/>	         
- 
- </feature>
+          id="org.eclipse.jetty.webapp"
+          download-size="0"
+          install-size="0"
+-         version="8.1.3.qualifier"
++         version="0.0.0"
+          unpack="false"/>
+ 
+    <plugin
+          id="org.eclipse.jetty.xml"
+          download-size="0"
+          install-size="0"
+-         version="8.1.3.qualifier"
++         version="0.0.0"
+          unpack="false"/>
+ 
+ </feature>
 diff --git a/org.eclipse.wst.server_ui.feature/feature.xml b/org.eclipse.wst.server_ui.feature/feature.xml
-index 47c3675..5b80128 100644
+index 7c84875..506c047 100644
 --- a/org.eclipse.wst.server_ui.feature/feature.xml
 +++ b/org.eclipse.wst.server_ui.feature/feature.xml
 @@ -19,12 +19,12 @@
@@ -98,7 +98,7 @@ index 47c3675..5b80128 100644
  
     <plugin
 diff --git a/org.eclipse.wst.web_core.feature/feature.xml b/org.eclipse.wst.web_core.feature/feature.xml
-index cbbc800..86bfc5c 100644
+index 0de2299..33b3c82 100644
 --- a/org.eclipse.wst.web_core.feature/feature.xml
 +++ b/org.eclipse.wst.web_core.feature/feature.xml
 @@ -19,20 +19,14 @@
@@ -129,7 +129,7 @@ index cbbc800..86bfc5c 100644
  
     <plugin
 diff --git a/org.eclipse.wst.web_ui.feature/feature.xml b/org.eclipse.wst.web_ui.feature/feature.xml
-index e0bfe4f..123fd20 100644
+index 0139065..ac026de 100644
 --- a/org.eclipse.wst.web_ui.feature/feature.xml
 +++ b/org.eclipse.wst.web_ui.feature/feature.xml
 @@ -20,6 +20,11 @@
@@ -202,129 +202,53 @@ index 8f5488f..6aae09b 100644
   org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
   org.eclipse.wst.command.env;bundle-version="[1.0.101,1.1.0)",
 diff --git a/org.eclipse.wst.ws_core.feature/feature.xml b/org.eclipse.wst.ws_core.feature/feature.xml
-index 8112f0c..70449f2 100644
+index 8112f0c..3b86059 100644
 --- a/org.eclipse.wst.ws_core.feature/feature.xml
 +++ b/org.eclipse.wst.ws_core.feature/feature.xml
-@@ -1,155 +1,145 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<feature
--      id="org.eclipse.wst.ws_core.feature"
--      label="%featureName"
--      version="3.5.0.qualifier"
--      provider-name="%providerName"
--      license-feature="org.eclipse.license"
--      license-feature-version="1.0.0.qualifier">
--
--   <description>
--      %description
--   </description>
--
--   <copyright>
--      %copyright
--   </copyright>
--
--   <license url="%licenseURL">
--      %license
--   </license>
--
--   <includes
--         id="org.eclipse.wst.ws_wsdl15.feature"
--         version="0.0.0"/>
--
--   <plugin
--         id="org.eclipse.wst.command.env"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/>
--
--   <plugin
--         id="org.eclipse.wst.command.env.core"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/>
--
--   <plugin
--         id="org.apache.commons.codec"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/>
--
--   <plugin
--         id="org.eclipse.wst.ws"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/>
--
--   <plugin
--         id="org.eclipse.wst.ws.parser"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/>
--
--   <plugin
--         id="org.eclipse.wst.wsdl"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/>
--
--   <plugin
--         id="org.eclipse.wst.wsdl.validation"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/>
--
+@@ -37,12 +37,12 @@
+          version="0.0.0"
+          unpack="false"/>
+ 
 -   <plugin
--         id="org.eclipse.wst.wsi"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
++   <!--plugin
+          id="org.apache.commons.codec"
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
 -         unpack="false"/>
--
--   <plugin
--         id="org.apache.commons.logging"
--         download-size="0"
--         install-size="0"
++         unpack="false"/-->
+ 
+    <plugin
+          id="org.eclipse.wst.ws"
+@@ -83,14 +83,14 @@
+          id="org.apache.commons.logging"
+          download-size="0"
+          install-size="0"
 -         version="1.0.4.qualifier"
--         unpack="false"/>
--
--   <plugin
--         id="org.apache.log4j"
--         download-size="0"
--         install-size="0"
++         version="0.0.0"
+          unpack="false"/>
+ 
+    <plugin
+          id="org.apache.log4j"
+          download-size="0"
+          install-size="0"
 -         version="1.2.15.qualifier"
--         unpack="false"/>
--
--   <plugin
--         id="org.apache.wsil4j"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/>
--
--   <plugin
--         id="org.uddi4j"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/>
--
--   <plugin
--         id="org.apache.commons.discovery"
--         download-size="0"
--         install-size="0"
++         version="0.0.0"
+          unpack="false"/>
+ 
+    <plugin
+@@ -111,35 +111,25 @@
+          id="org.apache.commons.discovery"
+          download-size="0"
+          install-size="0"
 -         version="0.0.0"/>
--
--   <plugin
--         id="javax.xml.rpc"
--         download-size="0"
--         install-size="0"
++         version="0.0.0"
++         unpack="false"/>
+ 
+    <plugin
+          id="javax.xml.rpc"
+          download-size="0"
+          install-size="0"
 -         version="0.0.0"/>
 -
 -   <plugin
@@ -332,185 +256,33 @@ index 8112f0c..70449f2 100644
 -         download-size="0"
 -         install-size="0"
 -         version="1.2.0.qualifier"/>
--
--   <plugin
--         id="org.apache.axis"
--         download-size="0"
--         install-size="0"
++         version="0.0.0"
++         unpack="false"/>
+ 
+    <plugin
+          id="org.apache.axis"
+          download-size="0"
+          install-size="0"
 -         version="0.0.0"/>
 -
 -   <plugin
 -         id="javax.mail"
 -         download-size="0"
 -         install-size="0"
--         version="0.0.0"
--         unpack="false"/>
--
--   <plugin
+          version="0.0.0"
+          unpack="false"/>
+ 
+    <plugin
 -         id="javax.activation"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/>
--
--   <plugin
--         id="org.eclipse.wst.ws.service.policy"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/>
--
--</feature>
-+<?xml version="1.0" encoding="UTF-8"?>
-+<feature
-+      id="org.eclipse.wst.ws_core.feature"
-+      label="%featureName"
-+      version="3.5.0.qualifier"
-+      provider-name="%providerName"
-+      license-feature="org.eclipse.license"
-+      license-feature-version="1.0.0.qualifier">
-+
-+   <description>
-+      %description
-+   </description>
-+
-+   <copyright>
-+      %copyright
-+   </copyright>
-+
-+   <license url="%licenseURL">
-+      %license
-+   </license>
-+
-+   <includes
-+         id="org.eclipse.wst.ws_wsdl15.feature"
-+         version="0.0.0"/>
-+
-+   <plugin
-+         id="org.eclipse.wst.command.env"
-+         download-size="0"
-+         install-size="0"
-+         version="0.0.0"
-+         unpack="false"/>
-+
-+   <plugin
-+         id="org.eclipse.wst.command.env.core"
-+         download-size="0"
-+         install-size="0"
-+         version="0.0.0"
-+         unpack="false"/>
-+
-+   <!--plugin
-+         id="org.apache.commons.codec"
-+         download-size="0"
-+         install-size="0"
-+         version="0.0.0"
-+         unpack="false"/-->
-+
-+   <plugin
-+         id="org.eclipse.wst.ws"
-+         download-size="0"
-+         install-size="0"
-+         version="0.0.0"
-+         unpack="false"/>
-+
-+   <plugin
-+         id="org.eclipse.wst.ws.parser"
-+         download-size="0"
-+         install-size="0"
-+         version="0.0.0"
-+         unpack="false"/>
-+
-+   <plugin
-+         id="org.eclipse.wst.wsdl"
-+         download-size="0"
-+         install-size="0"
-+         version="0.0.0"
-+         unpack="false"/>
-+
-+   <plugin
-+         id="org.eclipse.wst.wsdl.validation"
-+         download-size="0"
-+         install-size="0"
-+         version="0.0.0"
-+         unpack="false"/>
-+
-+   <plugin
-+         id="org.eclipse.wst.wsi"
-+         download-size="0"
-+         install-size="0"
-+         version="0.0.0"
-+         unpack="false"/>
-+
-+   <plugin
-+         id="org.apache.commons.logging"
-+         download-size="0"
-+         install-size="0"
-+         version="0.0.0"
-+         unpack="false"/>
-+
-+   <plugin
-+         id="org.apache.log4j"
-+         download-size="0"
-+         install-size="0"
-+         version="0.0.0"
-+         unpack="false"/>
-+
-+   <plugin
-+         id="org.apache.wsil4j"
-+         download-size="0"
-+         install-size="0"
-+         version="0.0.0"
-+         unpack="false"/>
-+
-+   <plugin
-+         id="org.uddi4j"
-+         download-size="0"
-+         install-size="0"
-+         version="0.0.0"
-+         unpack="false"/>
-+
-+   <plugin
-+         id="org.apache.commons.discovery"
-+         download-size="0"
-+         install-size="0"
-+         version="0.0.0"
-+         unpack="false"/>
-+
-+   <plugin
-+         id="javax.xml.rpc"
-+         download-size="0"
-+         install-size="0"
-+         version="0.0.0"
-+         unpack="false"/>
-+
-+   <plugin
-+         id="org.apache.axis"
-+         download-size="0"
-+         install-size="0"
-+         version="0.0.0"
-+         unpack="false"/>
-+
-+   <plugin
-+         id="javax.mail"
-+         download-size="0"
-+         install-size="0"
-+         version="0.0.0"
-+         unpack="false"/>
-+
-+   <plugin
-+         id="org.eclipse.wst.ws.service.policy"
-+         download-size="0"
-+         install-size="0"
-+         version="0.0.0"
-+         unpack="false"/>
-+
-+</feature>
++         id="javax.mail"
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
 diff --git a/org.eclipse.wst.ws_ui.feature/feature.xml b/org.eclipse.wst.ws_ui.feature/feature.xml
-index a3099e9..9c363ca 100644
+index fe462f6..9c0a4b6 100644
 --- a/org.eclipse.wst.ws_ui.feature/feature.xml
 +++ b/org.eclipse.wst.ws_ui.feature/feature.xml
-@@ -19,6 +19,10 @@
+@@ -21,6 +21,10 @@
        %license
     </license>
  
@@ -521,7 +293,7 @@ index a3099e9..9c363ca 100644
     <includes
           id="org.eclipse.wst.ws_userdoc.feature"
           version="0.0.0"/>
-@@ -27,10 +31,6 @@
+@@ -29,10 +33,6 @@
           id="org.eclipse.wst.ws_core.feature"
           version="0.0.0"/>
  
@@ -643,7 +415,7 @@ index ef33712..a25bfd2 100644
  Bundle-RequiredExecutionEnvironment: J2SE-1.5
  Export-Package: org.eclipse.wst.xml.xpath2.api,
 diff --git a/org.eclipse.wst.xml_core.feature/feature.xml b/org.eclipse.wst.xml_core.feature/feature.xml
-index 9560380..b26fe58 100644
+index 31f5afb..75fd1de 100644
 --- a/org.eclipse.wst.xml_core.feature/feature.xml
 +++ b/org.eclipse.wst.xml_core.feature/feature.xml
 @@ -20,31 +20,17 @@
@@ -681,7 +453,7 @@ index 9560380..b26fe58 100644
  
     <plugin
 diff --git a/org.eclipse.wst.xml_ui.feature/feature.xml b/org.eclipse.wst.xml_ui.feature/feature.xml
-index f556652..22e2c79 100644
+index 43f90fe..292cdf8 100644
 --- a/org.eclipse.wst.xml_ui.feature/feature.xml
 +++ b/org.eclipse.wst.xml_ui.feature/feature.xml
 @@ -21,9 +21,9 @@
diff --git a/debian/patches/regenerate-js-parser-resources.patch b/debian/patches/regenerate-js-parser-resources.patch
index 65fda53..1786a97 100644
--- a/debian/patches/regenerate-js-parser-resources.patch
+++ b/debian/patches/regenerate-js-parser-resources.patch
@@ -6,54 +6,54 @@ Subject: regenerate-js-parser-resources
 - do not Parser.initTables() when running UpdateParserFiles, as we don't
   have table data yet
 ---
- .../wst/jsdt/internal/compiler/parser/Parser.java  |    9 +++++++--
- .../internal/compiler/parser/TerminalTokens.java   |    5 +++++
+ .../org/eclipse/wst/jsdt/internal/compiler/parser/Parser.java    | 9 +++++++--
+ .../wst/jsdt/internal/compiler/parser/TerminalTokens.java        | 5 +++++
  2 files changed, 12 insertions(+), 2 deletions(-)
 
 diff --git a/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/compiler/parser/Parser.java b/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/compiler/parser/Parser.java
-index 4f40146..3f509d4 100755
+index a615d7f..a258378 100644
 --- a/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/compiler/parser/Parser.java
 +++ b/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/compiler/parser/Parser.java
-@@ -318,8 +318,10 @@ public class Parser implements  ParserBasicInformation, TerminalTokens, Operator
- 	public IInferEngine[] inferenceEngines;
- 	
- 	static {
-+		StackTraceElement[] trace = Thread.currentThread().getStackTrace();
- 		try{
--			initTables();
-+			if (!trace[trace.length - 1].getClassName().endsWith("UpdateParserFiles"))
-+				initTables();
- 		} catch(java.io.IOException ex){
- 			throw new ExceptionInInitializerError(ex.getMessage());
- 		}
-@@ -755,7 +757,7 @@ public final static void buildFilesFromLPG(String dataFilename, String dataFilen
- 
- 	buildFilesForFlags(
- 			prefix + (++i) + ".rsc", //$NON-NLS-1$
--			rhs.length,
-+			newRhs.length,
- 			tokens);
- 
- 
-@@ -2782,6 +2784,8 @@ protected void consumePostDoc() {
- 	}
- }
- 
+@@ -327,8 +327,10 @@ public class Parser implements  ParserBasicInformation, TerminalTokens, Operator
+ 	public IInferEngine[] inferenceEngines;
+ 	
+ 	static {
++		StackTraceElement[] trace = Thread.currentThread().getStackTrace();
+ 		try{
+-			initTables();
++			if (!trace[trace.length - 1].getClassName().endsWith("UpdateParserFiles"))
++				initTables();
+ 		} catch(java.io.IOException ex){
+ 			throw new ExceptionInInitializerError(ex.getMessage());
+ 		}
+@@ -764,7 +766,7 @@ public final static void buildFilesFromLPG(String dataFilename, String dataFilen
+ 
+ 	buildFilesForFlags(
+ 			prefix + (++i) + ".rsc", //$NON-NLS-1$
+-			rhs.length,
++			newRhs.length,
+ 			tokens);
+ 
+ 
+@@ -2791,6 +2793,8 @@ protected void consumePostDoc() {
+ 	}
+ }
+ 
 +// ### BEGIN GENERATED CODE ###
 +
- // This method is part of an automatic generation : do NOT edit-modify  
- protected void consumeRule(int act) {
-   switch ( act ) {
-@@ -3743,6 +3747,7 @@ protected void consumeRule(int act) {
- 	}
- }
- 
+ // This method is part of an automatic generation : do NOT edit-modify  
+ protected void consumeRule(int act) {
+   switch ( act ) {
+@@ -3752,6 +3756,7 @@ protected void consumeRule(int act) {
+ 	}
+ }
+ 
 +// ### END GENERATED CODE ###
- 
- private void consumeElisionList() {
- 	int flag=this.intStack[this.intPtr];
+ 
+ private void consumeElisionList() {
+ 	int flag=this.intStack[this.intPtr];
 diff --git a/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/compiler/parser/TerminalTokens.java b/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/compiler/parser/TerminalTokens.java
-index e98347c..bd28bc2 100755
+index e98347c..bd28bc2 100644
 --- a/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/compiler/parser/TerminalTokens.java
 +++ b/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/compiler/parser/TerminalTokens.java
 @@ -34,6 +34,8 @@ public interface TerminalTokens {
@@ -73,4 +73,3 @@ index e98347c..bd28bc2 100755
 +// ### END GENERATED CODE ###
 +
  }
--- 

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



More information about the pkg-java-commits mailing list