Made all bundles require a Java 1.4 EE, and backported some classescode to Java 1.4

diff --git a/net.sourceforge.phpeclipse.core/.classpath b/net.sourceforge.phpeclipse.core/.classpath
index 065ac06..ce73933 100644 (file)
--- a/net.sourceforge.phpeclipse.core/.classpath
+++ b/net.sourceforge.phpeclipse.core/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
        <classpathentry kind="src" path="src"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
        <classpathentry kind="output" path="bin"/>
 </classpath>

diff --git a/net.sourceforge.phpeclipse.core/.settings/org.eclipse.jdt.core.prefs b/net.sourceforge.phpeclipse.core/.settings/org.eclipse.jdt.core.prefs
new file mode 100644 (file)
index 0000000..9d630b4
--- /dev/null
+++ b/net.sourceforge.phpeclipse.core/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+#Fri Sep 07 14:46:23 PDT 2007
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.source=1.3

diff --git a/net.sourceforge.phpeclipse.debug.core/.classpath b/net.sourceforge.phpeclipse.debug.core/.classpath
index 275b34c..ce73933 100644 (file)
--- a/net.sourceforge.phpeclipse.debug.core/.classpath
+++ b/net.sourceforge.phpeclipse.debug.core/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry kind="src" path="src/"/>
+       <classpathentry kind="src" path="src"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
        <classpathentry kind="output" path="bin"/>
 </classpath>

diff --git a/net.sourceforge.phpeclipse.debug.core/.settings/org.eclipse.jdt.core.prefs b/net.sourceforge.phpeclipse.debug.core/.settings/org.eclipse.jdt.core.prefs
new file mode 100644 (file)
index 0000000..9d630b4
--- /dev/null
+++ b/net.sourceforge.phpeclipse.debug.core/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+#Fri Sep 07 14:46:23 PDT 2007
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.source=1.3

diff --git a/net.sourceforge.phpeclipse.debug.core/META-INF/MANIFEST.MF b/net.sourceforge.phpeclipse.debug.core/META-INF/MANIFEST.MF
index 77c2c23..3b0f6a9 100644 (file)
--- a/net.sourceforge.phpeclipse.debug.core/META-INF/MANIFEST.MF
+++ b/net.sourceforge.phpeclipse.debug.core/META-INF/MANIFEST.MF
@@ -17,4 +17,5 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.resources,
  org.eclipse.debug.core,
  net.sourceforge.phpeclipse
+Bundle-RequiredExecutionEnvironment: J2SE-1.4
 Eclipse-LazyStart: true

diff --git a/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/model/PHPStackFrame.java b/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/model/PHPStackFrame.java
index dfac692..245dc76 100644 (file)
--- a/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/model/PHPStackFrame.java
+++ b/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/model/PHPStackFrame.java
@@ -608,18 +608,20 @@ public class PHPStackFrame extends PHPDebugElement implements IStackFrame, Compa
         * @return
         * <ul>
         * <li> -1 if the index of this stackframe is less.
-        * <li> 0 if the index of both stackfream is equal (should no happen).
-        * <li> 1 if the index of this stackfram is greater.
+        * <li> 0 if the index of both stackframes are equal (should no happen).
+        * <li> 1 if the index of this stackframe is greater.
         * </ul>
         */
        public int compareTo(Object obj) {
-               //if (index < ((PHPStackFrame) obj).getIndex()) {
-               //      return -1;
-               //} else if (index > ((PHPStackFrame) obj).getIndex()) {
-               //      return 1;
-               //}
-
-               //return 0;
-               return Integer.signum(index - ((PHPStackFrame) obj).getIndex());
+               if (!(obj instanceof PHPStackFrame)) {
+                       throw new IllegalArgumentException("A PHPStackFrame can only be compared with another PHPStackFrame");
+               }
+               int frameIndex = ((PHPStackFrame) obj).getIndex();
+               if (index < frameIndex) {
+                       return -1;
+               } else if (index > frameIndex) {
+                       return 1;
+               }
+               return 0;
        }
 }

diff --git a/net.sourceforge.phpeclipse.debug.ui/.classpath b/net.sourceforge.phpeclipse.debug.ui/.classpath
index 275b34c..52165ec 100644 (file)
--- a/net.sourceforge.phpeclipse.debug.ui/.classpath
+++ b/net.sourceforge.phpeclipse.debug.ui/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
        <classpathentry kind="src" path="src/"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
        <classpathentry kind="output" path="bin"/>
 </classpath>

diff --git a/net.sourceforge.phpeclipse.debug.ui/.settings/org.eclipse.jdt.core.prefs b/net.sourceforge.phpeclipse.debug.ui/.settings/org.eclipse.jdt.core.prefs
new file mode 100644 (file)
index 0000000..9d630b4
--- /dev/null
+++ b/net.sourceforge.phpeclipse.debug.ui/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+#Fri Sep 07 14:46:23 PDT 2007
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.source=1.3

diff --git a/net.sourceforge.phpeclipse.externaltools/.classpath b/net.sourceforge.phpeclipse.externaltools/.classpath
index 065ac06..ce73933 100644 (file)
--- a/net.sourceforge.phpeclipse.externaltools/.classpath
+++ b/net.sourceforge.phpeclipse.externaltools/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
        <classpathentry kind="src" path="src"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
        <classpathentry kind="output" path="bin"/>
 </classpath>

diff --git a/net.sourceforge.phpeclipse.externaltools/.settings/org.eclipse.jdt.core.prefs b/net.sourceforge.phpeclipse.externaltools/.settings/org.eclipse.jdt.core.prefs
new file mode 100644 (file)
index 0000000..f95f009
--- /dev/null
+++ b/net.sourceforge.phpeclipse.externaltools/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+#Fri Sep 07 14:51:48 PDT 2007
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.source=1.3

diff --git a/net.sourceforge.phpeclipse.externaltools/META-INF/MANIFEST.MF b/net.sourceforge.phpeclipse.externaltools/META-INF/MANIFEST.MF
index 63baaf8..c2555d1 100644 (file)
--- a/net.sourceforge.phpeclipse.externaltools/META-INF/MANIFEST.MF
+++ b/net.sourceforge.phpeclipse.externaltools/META-INF/MANIFEST.MF
@@ -30,4 +30,5 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.debug.ui,
  org.eclipse.ui.externaltools,
  net.sourceforge.phpeclipse.ui
+Bundle-RequiredExecutionEnvironment: J2SE-1.4
 Eclipse-LazyStart: true

diff --git a/net.sourceforge.phpeclipse.launching/.classpath b/net.sourceforge.phpeclipse.launching/.classpath
index 065ac06..ce73933 100644 (file)
--- a/net.sourceforge.phpeclipse.launching/.classpath
+++ b/net.sourceforge.phpeclipse.launching/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
        <classpathentry kind="src" path="src"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
        <classpathentry kind="output" path="bin"/>
 </classpath>

diff --git a/net.sourceforge.phpeclipse.launching/.settings/org.eclipse.jdt.core.prefs b/net.sourceforge.phpeclipse.launching/.settings/org.eclipse.jdt.core.prefs
new file mode 100644 (file)
index 0000000..f95f009
--- /dev/null
+++ b/net.sourceforge.phpeclipse.launching/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+#Fri Sep 07 14:51:48 PDT 2007
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.source=1.3

diff --git a/net.sourceforge.phpeclipse.launching/META-INF/MANIFEST.MF b/net.sourceforge.phpeclipse.launching/META-INF/MANIFEST.MF
index 32387cc..f2db42a 100644 (file)
--- a/net.sourceforge.phpeclipse.launching/META-INF/MANIFEST.MF
+++ b/net.sourceforge.phpeclipse.launching/META-INF/MANIFEST.MF
@@ -19,4 +19,5 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.debug.ui,
  net.sourceforge.phpeclipse.ui,
  org.eclipse.ui.ide
+Bundle-RequiredExecutionEnvironment: J2SE-1.4
 Eclipse-LazyStart: true

diff --git a/net.sourceforge.phpeclipse.phphelp/.classpath b/net.sourceforge.phpeclipse.phphelp/.classpath
index 275b34c..52165ec 100644 (file)
--- a/net.sourceforge.phpeclipse.phphelp/.classpath
+++ b/net.sourceforge.phpeclipse.phphelp/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
        <classpathentry kind="src" path="src/"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
        <classpathentry kind="output" path="bin"/>
 </classpath>

diff --git a/net.sourceforge.phpeclipse.phphelp/.settings/org.eclipse.jdt.core.prefs b/net.sourceforge.phpeclipse.phphelp/.settings/org.eclipse.jdt.core.prefs
new file mode 100644 (file)
index 0000000..4b9a220
--- /dev/null
+++ b/net.sourceforge.phpeclipse.phphelp/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+#Sat Sep 08 11:34:15 PDT 2007
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.source=1.3

diff --git a/net.sourceforge.phpeclipse.phphelp/META-INF/MANIFEST.MF b/net.sourceforge.phpeclipse.phphelp/META-INF/MANIFEST.MF
index 7b5b63c..a1378dc 100644 (file)
--- a/net.sourceforge.phpeclipse.phphelp/META-INF/MANIFEST.MF
+++ b/net.sourceforge.phpeclipse.phphelp/META-INF/MANIFEST.MF
@@ -22,3 +22,4 @@ Require-Bundle: org.eclipse.core.runtime,
  net.sourceforge.phpeclipse.webbrowser,
  org.eclipse.ui.workbench.texteditor
 Eclipse-LazyStart: true
+Bundle-RequiredExecutionEnvironment: J2SE-1.4

diff --git a/net.sourceforge.phpeclipse.phpunit/.classpath b/net.sourceforge.phpeclipse.phpunit/.classpath
index 751c8f2..ce73933 100644 (file)
--- a/net.sourceforge.phpeclipse.phpunit/.classpath
+++ b/net.sourceforge.phpeclipse.phpunit/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
        <classpathentry kind="src" path="src"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="output" path="bin"/>
 </classpath>

diff --git a/net.sourceforge.phpeclipse.phpunit/.settings/org.eclipse.jdt.core.prefs b/net.sourceforge.phpeclipse.phpunit/.settings/org.eclipse.jdt.core.prefs
new file mode 100644 (file)
index 0000000..f95f009
--- /dev/null
+++ b/net.sourceforge.phpeclipse.phpunit/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+#Fri Sep 07 14:51:48 PDT 2007
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.source=1.3

diff --git a/net.sourceforge.phpeclipse.phpunit/META-INF/MANIFEST.MF b/net.sourceforge.phpeclipse.phpunit/META-INF/MANIFEST.MF
index 328d632..4719f77 100644 (file)
--- a/net.sourceforge.phpeclipse.phpunit/META-INF/MANIFEST.MF
+++ b/net.sourceforge.phpeclipse.phpunit/META-INF/MANIFEST.MF
@@ -6,12 +6,13 @@ Bundle-Version: 1.0.0
 Bundle-ClassPath: phpunit.jar
 Bundle-Activator: org.eclipse.core.internal.compatibility.PluginActivator
 Bundle-Vendor: PHPEclipse project team
-Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime.compatibility
-Eclipse-LazyStart: true
 Plugin-Class: net.sourceforge.phpeclipse.phpunit.PHPUnitPlugin
 Export-Package: net.sourceforge.phpeclipse.phpunit,
  net.sourceforge.phpeclipse.phpunit.preferences,
  net.sourceforge.phpeclipse.phpunit.reporthandling,
  net.sourceforge.phpeclipse.phpunit.testpool
+Bundle-RequiredExecutionEnvironment: J2SE-1.4
+Eclipse-LazyStart: true
+

diff --git a/net.sourceforge.phpeclipse.smarty.ui/.classpath b/net.sourceforge.phpeclipse.smarty.ui/.classpath
index 065ac06..ce73933 100644 (file)
--- a/net.sourceforge.phpeclipse.smarty.ui/.classpath
+++ b/net.sourceforge.phpeclipse.smarty.ui/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
        <classpathentry kind="src" path="src"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
        <classpathentry kind="output" path="bin"/>
 </classpath>

diff --git a/net.sourceforge.phpeclipse.smarty.ui/.settings/org.eclipse.jdt.core.prefs b/net.sourceforge.phpeclipse.smarty.ui/.settings/org.eclipse.jdt.core.prefs
new file mode 100644 (file)
index 0000000..ee8d6f4
--- /dev/null
+++ b/net.sourceforge.phpeclipse.smarty.ui/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+#Fri Sep 07 14:48:43 PDT 2007
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.source=1.3

diff --git a/net.sourceforge.phpeclipse.smarty.ui/META-INF/MANIFEST.MF b/net.sourceforge.phpeclipse.smarty.ui/META-INF/MANIFEST.MF
index 419c68e..9202956 100644 (file)
--- a/net.sourceforge.phpeclipse.smarty.ui/META-INF/MANIFEST.MF
+++ b/net.sourceforge.phpeclipse.smarty.ui/META-INF/MANIFEST.MF
@@ -6,7 +6,6 @@ Bundle-Version: 0.0.0
 Bundle-ClassPath: smartyui.jar
 Bundle-Activator: net.sourceforge.phpdt.smarty.ui.SmartyUI
 Bundle-Vendor: PHPEclipse project team
-Bundle-Localization: plugin
 Export-Package: net.sourceforge.phpdt.smarty.ui,
  net.sourceforge.phpdt.smarty.ui.internal;x-internal:=true,
  net.sourceforge.phpdt.smarty.ui.internal.editor;x-internal:=true,
@@ -21,4 +20,5 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.jface.text,
  net.sourceforge.phpeclipse.ui,
  net.sourceforge.phpeclipse.xml.ui
+Bundle-RequiredExecutionEnvironment: J2SE-1.4
 Eclipse-LazyStart: true

diff --git a/net.sourceforge.phpeclipse.ui/.classpath b/net.sourceforge.phpeclipse.ui/.classpath
index 275b34c..52165ec 100644 (file)
--- a/net.sourceforge.phpeclipse.ui/.classpath
+++ b/net.sourceforge.phpeclipse.ui/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
        <classpathentry kind="src" path="src/"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
        <classpathentry kind="output" path="bin"/>
 </classpath>

diff --git a/net.sourceforge.phpeclipse.ui/.settings/org.eclipse.jdt.core.prefs b/net.sourceforge.phpeclipse.ui/.settings/org.eclipse.jdt.core.prefs
new file mode 100644 (file)
index 0000000..f95f009
--- /dev/null
+++ b/net.sourceforge.phpeclipse.ui/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+#Fri Sep 07 14:51:48 PDT 2007
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.source=1.3

diff --git a/net.sourceforge.phpeclipse.ui/META-INF/MANIFEST.MF b/net.sourceforge.phpeclipse.ui/META-INF/MANIFEST.MF
index 72f2a82..2dd512c 100644 (file)
--- a/net.sourceforge.phpeclipse.ui/META-INF/MANIFEST.MF
+++ b/net.sourceforge.phpeclipse.ui/META-INF/MANIFEST.MF
@@ -30,4 +30,5 @@ Require-Bundle: net.sourceforge.phpeclipse.core,
  org.eclipse.ui.views,
  org.eclipse.ui.workbench.texteditor,
  net.sourceforge.phpeclipse.webbrowser
+Bundle-RequiredExecutionEnvironment: J2SE-1.4
 Eclipse-LazyStart: true

diff --git a/net.sourceforge.phpeclipse.webbrowser/.classpath b/net.sourceforge.phpeclipse.webbrowser/.classpath
index 065ac06..ce73933 100644 (file)
--- a/net.sourceforge.phpeclipse.webbrowser/.classpath
+++ b/net.sourceforge.phpeclipse.webbrowser/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
        <classpathentry kind="src" path="src"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
        <classpathentry kind="output" path="bin"/>
 </classpath>

diff --git a/net.sourceforge.phpeclipse.webbrowser/.settings/org.eclipse.jdt.core.prefs b/net.sourceforge.phpeclipse.webbrowser/.settings/org.eclipse.jdt.core.prefs
new file mode 100644 (file)
index 0000000..f95f009
--- /dev/null
+++ b/net.sourceforge.phpeclipse.webbrowser/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+#Fri Sep 07 14:51:48 PDT 2007
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.source=1.3

diff --git a/net.sourceforge.phpeclipse.webbrowser/LICENSE.txt b/net.sourceforge.phpeclipse.webbrowser/LICENSE.txt
new file mode 100644 (file)
index 0000000..5a1188f
--- /dev/null
+++ b/net.sourceforge.phpeclipse.webbrowser/LICENSE.txt
@@ -0,0 +1,33 @@
+/***
+ * Retrotranslator: a Java bytecode transformer that translates Java classes
+ * compiled with JDK 5.0 into classes that can be run on JVM 1.4.
+ * 
+ * Copyright (c) 2005 - 2007 Taras Puchko
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) 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 OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * Borrowed from http://retrotranslator.cvs.sourceforge.net/*checkout*/retrotranslator/Retrotranslator/src/net/sf/retrotranslator/runtime/java/nio/charset/_Charset.java
+ */

diff --git a/net.sourceforge.phpeclipse.webbrowser/META-INF/MANIFEST.MF b/net.sourceforge.phpeclipse.webbrowser/META-INF/MANIFEST.MF
index 49e7d21..c74df75 100644 (file)
--- a/net.sourceforge.phpeclipse.webbrowser/META-INF/MANIFEST.MF
+++ b/net.sourceforge.phpeclipse.webbrowser/META-INF/MANIFEST.MF
@@ -14,4 +14,5 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="3.0.0",
  org.eclipse.core.runtime;bundle-version="3.0.0",
  org.eclipse.ui;bundle-version="3.0.0",
  org.eclipse.ui.ide;bundle-version="3.0.0"
+Bundle-RequiredExecutionEnvironment: J2SE-1.4
 Eclipse-LazyStart: true

diff --git a/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/views/BrowserView.java b/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/views/BrowserView.java
index 443d433..c60b9e4 100644 (file)
--- a/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/views/BrowserView.java
+++ b/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/views/BrowserView.java
@@ -126,6 +126,8 @@ public class BrowserView extends ViewPart implements IShowInTarget {
                }
        }
 
+       
+       
        public void refresh(String url) {
                if (fInstance != null && url != null) {
                        if (fUrl == null) {
@@ -135,7 +137,7 @@ public class BrowserView extends ViewPart implements IShowInTarget {
                                if (browser != null) {
                                        String browserUrl = browser.getUrl();
                                        try {
-                                               browserUrl = URLDecoder.decode(browserUrl, Charset.defaultCharset().name());
+                                               browserUrl = URLDecoder.decode(browserUrl, J5CharsetEmulator.defaultCharset().name());
                                        } catch (UnsupportedEncodingException e) {
                                                // e.printStackTrace();
                                        }

diff --git a/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/views/J5CharsetEmulator.java b/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/views/J5CharsetEmulator.java
new file mode 100644 (file)
index 0000000..6ebf54c
--- /dev/null
+++ b/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/views/J5CharsetEmulator.java
@@ -0,0 +1,59 @@
+/***
+ * Retrotranslator: a Java bytecode transformer that translates Java classes
+ * compiled with JDK 5.0 into classes that can be run on JVM 1.4.
+ * 
+ * Copyright (c) 2005 - 2007 Taras Puchko
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) 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 OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * Borrowed from http://retrotranslator.cvs.sourceforge.net/retrotranslator/Retrotranslator/src/net/sf/retrotranslator/runtime/java/nio/charset/_Charset.java
+ */
+package net.sourceforge.phpeclipse.webbrowser.views;
+
+import java.io.ByteArrayOutputStream;
+import java.io.OutputStreamWriter;
+import java.nio.charset.Charset;
+import java.nio.charset.UnsupportedCharsetException;
+
+/**
+ * @author Taras Puchko
+ */
+public class J5CharsetEmulator {
+
+    public static Charset defaultCharset() {
+        try {
+            // The default charset depends on the locale 
+            // and the "file.encoding" property.
+            return Charset.forName(new OutputStreamWriter
+                    (new ByteArrayOutputStream()).getEncoding());
+        } catch (UnsupportedCharsetException e) {
+            // UTF-8 is used on JDK 1.4.0
+            // if the default charset is unavailable.
+            return Charset.forName("UTF-8");
+        }
+    }
+
+}

diff --git a/net.sourceforge.phpeclipse.xdebug.core/.classpath b/net.sourceforge.phpeclipse.xdebug.core/.classpath
index 065ac06..ce73933 100644 (file)
--- a/net.sourceforge.phpeclipse.xdebug.core/.classpath
+++ b/net.sourceforge.phpeclipse.xdebug.core/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
        <classpathentry kind="src" path="src"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
        <classpathentry kind="output" path="bin"/>
 </classpath>

diff --git a/net.sourceforge.phpeclipse.xdebug.core/.settings/org.eclipse.jdt.core.prefs b/net.sourceforge.phpeclipse.xdebug.core/.settings/org.eclipse.jdt.core.prefs
new file mode 100644 (file)
index 0000000..f95f009
--- /dev/null
+++ b/net.sourceforge.phpeclipse.xdebug.core/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+#Fri Sep 07 14:51:48 PDT 2007
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.source=1.3

diff --git a/net.sourceforge.phpeclipse.xdebug.core/META-INF/MANIFEST.MF b/net.sourceforge.phpeclipse.xdebug.core/META-INF/MANIFEST.MF
index 4ecc2dc..823ab16 100644 (file)
--- a/net.sourceforge.phpeclipse.xdebug.core/META-INF/MANIFEST.MF
+++ b/net.sourceforge.phpeclipse.xdebug.core/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
 Bundle-Name: XDebug Core
 Bundle-SymbolicName: net.sourceforge.phpeclipse.xdebug.core;singleton:=true
 Bundle-Version: 0.0.1
 Bundle-ClassPath: core.jar
 Bundle-Activator: net.sourceforge.phpeclipse.xdebug.core.XDebugCorePlugin
-Bundle-Localization: plugin
 Bundle-Vendor: PHPEclipse project team
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
@@ -13,8 +13,8 @@ Require-Bundle: org.eclipse.ui,
 Provide-Package: net.sourceforge.phpeclipse.xdebug.core,
  net.sourceforge.phpeclipse.xdebug.php.launching,
  net.sourceforge.phpeclipse.xdebug.php.model
-Eclipse-LazyStart: true
 Export-Package: net.sourceforge.phpeclipse.xdebug.core,
  net.sourceforge.phpeclipse.xdebug.php.launching,
  net.sourceforge.phpeclipse.xdebug.php.model
-Bundle-ManifestVersion: 2
+Bundle-RequiredExecutionEnvironment: J2SE-1.4
+Eclipse-LazyStart: true

diff --git a/net.sourceforge.phpeclipse.xdebug.ui/.classpath b/net.sourceforge.phpeclipse.xdebug.ui/.classpath
index 751c8f2..ce73933 100644 (file)
--- a/net.sourceforge.phpeclipse.xdebug.ui/.classpath
+++ b/net.sourceforge.phpeclipse.xdebug.ui/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
        <classpathentry kind="src" path="src"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="output" path="bin"/>
 </classpath>

diff --git a/net.sourceforge.phpeclipse.xdebug.ui/.settings/org.eclipse.jdt.core.prefs b/net.sourceforge.phpeclipse.xdebug.ui/.settings/org.eclipse.jdt.core.prefs
new file mode 100644 (file)
index 0000000..f95f009
--- /dev/null
+++ b/net.sourceforge.phpeclipse.xdebug.ui/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+#Fri Sep 07 14:51:48 PDT 2007
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.source=1.3

diff --git a/net.sourceforge.phpeclipse.xdebug.ui/META-INF/MANIFEST.MF b/net.sourceforge.phpeclipse.xdebug.ui/META-INF/MANIFEST.MF
index 1a84bfc..a7b83a3 100644 (file)
--- a/net.sourceforge.phpeclipse.xdebug.ui/META-INF/MANIFEST.MF
+++ b/net.sourceforge.phpeclipse.xdebug.ui/META-INF/MANIFEST.MF
@@ -4,7 +4,6 @@ Bundle-Name: XDebug UI
 Bundle-SymbolicName: net.sourceforge.phpeclipse.xdebug.ui ; singleton:=true
 Bundle-Version: 0.0.1
 Bundle-Activator: net.sourceforge.phpeclipse.xdebug.ui.XDebugUIPlugin
-Bundle-Localization: plugin
 Bundle-Vendor: PHPEclipse project team
 Require-Bundle: org.eclipse.core.resources,
  org.eclipse.core.runtime,
@@ -22,4 +21,5 @@ Export-Package: net.sourceforge.phpeclipse.xdebug.ui,
  net.sourceforge.phpeclipse.xdebug.ui.php.launching,
  net.sourceforge.phpeclipse.xdebug.ui.php.model,
  net.sourceforge.phpeclipse.xdebug.ui.preference
+Bundle-RequiredExecutionEnvironment: J2SE-1.4
 Eclipse-LazyStart: true

diff --git a/net.sourceforge.phpeclipse.xml.core/.classpath b/net.sourceforge.phpeclipse.xml.core/.classpath
index 275b34c..52165ec 100644 (file)
--- a/net.sourceforge.phpeclipse.xml.core/.classpath
+++ b/net.sourceforge.phpeclipse.xml.core/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
        <classpathentry kind="src" path="src/"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
        <classpathentry kind="output" path="bin"/>
 </classpath>

diff --git a/net.sourceforge.phpeclipse.xml.core/.settings/org.eclipse.jdt.core.prefs b/net.sourceforge.phpeclipse.xml.core/.settings/org.eclipse.jdt.core.prefs
new file mode 100644 (file)
index 0000000..f95f009
--- /dev/null
+++ b/net.sourceforge.phpeclipse.xml.core/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+#Fri Sep 07 14:51:48 PDT 2007
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.source=1.3

diff --git a/net.sourceforge.phpeclipse.xml.core/META-INF/MANIFEST.MF b/net.sourceforge.phpeclipse.xml.core/META-INF/MANIFEST.MF
index 59e84cb..45d0c0b 100644 (file)
--- a/net.sourceforge.phpeclipse.xml.core/META-INF/MANIFEST.MF
+++ b/net.sourceforge.phpeclipse.xml.core/META-INF/MANIFEST.MF
@@ -14,3 +14,5 @@ Require-Bundle: net.sourceforge.phpeclipse.core,
  org.eclipse.core.resources,
  org.eclipse.core.runtime,
  org.eclipse.text
+Bundle-RequiredExecutionEnvironment: J2SE-1.4
+Eclipse-LazyStart: true

diff --git a/net.sourceforge.phpeclipse.xml.ui/.classpath b/net.sourceforge.phpeclipse.xml.ui/.classpath
index 275b34c..52165ec 100644 (file)
--- a/net.sourceforge.phpeclipse.xml.ui/.classpath
+++ b/net.sourceforge.phpeclipse.xml.ui/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
        <classpathentry kind="src" path="src/"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
        <classpathentry kind="output" path="bin"/>
 </classpath>

diff --git a/net.sourceforge.phpeclipse.xml.ui/.settings/org.eclipse.jdt.core.prefs b/net.sourceforge.phpeclipse.xml.ui/.settings/org.eclipse.jdt.core.prefs
new file mode 100644 (file)
index 0000000..f95f009
--- /dev/null
+++ b/net.sourceforge.phpeclipse.xml.ui/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+#Fri Sep 07 14:51:48 PDT 2007
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.source=1.3

diff --git a/net.sourceforge.phpeclipse.xml.ui/META-INF/MANIFEST.MF b/net.sourceforge.phpeclipse.xml.ui/META-INF/MANIFEST.MF
index 82ef9d5..2eefcf8 100644 (file)
--- a/net.sourceforge.phpeclipse.xml.ui/META-INF/MANIFEST.MF
+++ b/net.sourceforge.phpeclipse.xml.ui/META-INF/MANIFEST.MF
@@ -26,4 +26,5 @@ Require-Bundle: net.sourceforge.phpeclipse.core,
  org.eclipse.ui.ide,
  org.eclipse.ui.views,
  org.eclipse.ui.workbench.texteditor
+Bundle-RequiredExecutionEnvironment: J2SE-1.4
 Eclipse-LazyStart: true

diff --git a/net.sourceforge.phpeclipse/.classpath b/net.sourceforge.phpeclipse/.classpath
index 275b34c..52165ec 100644 (file)
--- a/net.sourceforge.phpeclipse/.classpath
+++ b/net.sourceforge.phpeclipse/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
        <classpathentry kind="src" path="src/"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
        <classpathentry kind="output" path="bin"/>
 </classpath>

diff --git a/net.sourceforge.phpeclipse/.settings/org.eclipse.jdt.core.prefs b/net.sourceforge.phpeclipse/.settings/org.eclipse.jdt.core.prefs
new file mode 100644 (file)
index 0000000..1db5bb9
--- /dev/null
+++ b/net.sourceforge.phpeclipse/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+#Fri Sep 07 14:46:22 PDT 2007
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.source=1.3