eclipse-jikesbuild.patch

   1 --- eclipse-3.1/plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/registry/ExtensionRegistry.java.orig     2005-04-09 10:45:14.000000000 +0000
   2 +++ eclipse-3.1/plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/registry/ExtensionRegistry.java  2005-04-09 10:45:50.000000000 +0000
   3 @@ -57,7 +57,7 @@
   4                 public IStatus run(IProgressMonitor monitor) {
   5                         MultiStatus result = new MultiStatus(Platform.PI_RUNTIME, IStatus.OK, Policy.bind("plugin.eventListenerError"), null); //$NON-NLS-1$
   6                         for (int i = 0; i < listenerInfos.length; i++) {
   7 -                               ListenerInfo listenerInfo = (ListenerInfo) listenerInfos[i];
   8 +                               ExtensionRegistry.ListenerInfo listenerInfo = (ExtensionRegistry.ListenerInfo) listenerInfos[i];
   9                                 if (listenerInfo.filter != null && !deltas.containsKey(listenerInfo.filter))
  10                                         continue;
  11                                 try {
  12 --- eclipse-3.1/plugins/org.eclipse.jface.text/src/org/eclipse/jface/text/link/LinkedModeUI.java.orig   2005-04-09 10:52:13.000000000 +0000
  13 +++ eclipse-3.1/plugins/org.eclipse.jface.text/src/org/eclipse/jface/text/link/LinkedModeUI.java        2005-04-09 10:52:46.000000000 +0000
  14 @@ -161,7 +161,7 @@
  15                 Shell fShell;
  16
  17                 /** The registered listener, or <code>null</code>. */
  18 -               KeyListener fKeyListener;
  19 +               LinkedModeUI.KeyListener fKeyListener;
  20
  21                 /** The cached custom annotation model. */
  22                 LinkedPositionAnnotations fAnnotationModel;
  23 --- eclipse-3.1/plugins/org.eclipse.help.webapp/build.xml.orig  2005-04-09 10:59:29.000000000 +0000
  24 +++ eclipse-3.1/plugins/org.eclipse.help.webapp/build.xml       2005-04-09 10:59:35.000000000 +0000
  25 @@ -134,7 +134,6 @@
  26                 <!-- compile the source code -->
  27                 <javac destdir="${temp.folder}/WEB-INF/lib/jsp.jar.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bootclasspath}" classpath="../org.eclipse.core.boot/bin;../org.eclipse.core.boot/boot.jar;bin;webapp.jar;WEB-INF/lib/servlets.jar;../org.eclipse.tomcat/servlet.jar;../org.eclipse.tomcat/jasper-runtime.jar;../org.eclipse.core.runtime/bin;../org.eclipse.core.runtime/runtime.jar;../org.eclipse.osgi/bin;../org.eclipse.osgi/osgi.jar;../org.eclipse.osgi/core.jar;../org.eclipse.osgi/resolver.jar;../org.eclipse.osgi/defaultAdaptor.jar;../org.eclipse.osgi/eclipseAdaptor.jar;../org.eclipse.osgi/console.jar;../org.eclipse.osgi.services/bin;../org.eclipse.osgi.services/services.jar;../org.eclipse.osgi.util/bin;../org.eclipse.osgi.util/util.jar;../org.eclipse.help.base/bin;../org.eclipse.help.base/helpbase.jar;../org.apache.lucene/bin;../org.apache.lucene/parser.jar;../org.apache.lucene/lucene-1.3-final.jar;../org.eclipse.help/bin;../org.eclipse.help/help.jar;../org.eclipse.help.appserver/bin;../org.eclipse.help.appserver/appserver.jar;../org.eclipse.core.runtime.compatibility/bin;../org.eclipse.core.runtime.compatibility/compatibility.jar;../org.eclipse.update.configurator/bin;../org.eclipse.update.configurator/configurator.jar" source="${javacSource}" target="${javacTarget}"            >
  28                         <src path="${temp.folder}/jsp.jar.src/"                 />
  29 -                       <compilerarg value="-warn:-serial" />
  30                 </javac>
  31                 <!-- copy necessary resources -->
  32                 <copy todir="${temp.folder}/WEB-INF/lib/jsp.jar.bin">
  33 --- eclipse-3.1/plugins/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/BatchingLock.java.orig     2005-04-09 13:21:52.000000000 +0000
  34 +++ eclipse-3.1/plugins/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/BatchingLock.java  2005-04-09 13:22:21.000000000 +0000
  35 @@ -230,7 +230,7 @@
  36         }
  37
  38         public interface IFlushOperation {
  39 -               public void flush(ThreadInfo info, IProgressMonitor monitor) throws TeamException;
  40 +               public void flush(BatchingLock.ThreadInfo info, IProgressMonitor monitor) throws TeamException;
  41         }
  42
  43         private Map infos = new HashMap();
  44 --- eclipse-3.1/plugins/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/AnnotationExpansionControl.java.orig 2005-04-09 13:33:28.000000000 +0000
  45 +++ eclipse-3.1/plugins/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/AnnotationExpansionControl.java      2005-04-09 13:33:50.000000000 +0000
  46 @@ -170,7 +170,7 @@
  47                  * @see org.eclipse.swt.events.DisposeListener#widgetDisposed(org.eclipse.swt.events.DisposeEvent)
  48                  */
  49                 public void widgetDisposed(DisposeEvent e) {
  50 -                       Item item= (Item) ((Widget) e.getSource()).getData();
  51 +                       AnnotationExpansionControl.Item item= (AnnotationExpansionControl.Item) ((Widget) e.getSource()).getData();
  52                         item.deselect();
  53                         item.canvas= null;
  54                         item.fAnnotation= null;
  55 --- eclipse-3.1/plugins/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/SuperTypeNamesCollector.java.orig     2005-04-09 13:53:03.000000000 +0000
  56 +++ eclipse-3.1/plugins/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/SuperTypeNamesCollector.java  2005-04-09 13:53:05.000000000 +0000
  57 @@ -63,7 +63,7 @@
  58                 public boolean visit(FieldDeclaration fieldDeclaration, MethodScope scope) {
  59                         return false; // don't visit field declarations
  60                 }
  61 -               public boolean visit(Initializer initializer, MethodScope scope) {
  62 +               public boolean visit(org.eclipse.jdt.internal.compiler.ast.Initializer initializer, MethodScope scope) {
  63                         return false; // don't visit initializers
  64                 }
  65                 public boolean visit(ConstructorDeclaration constructorDeclaration, ClassScope scope) {
  66 --- eclipse-3.1/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/compiler/parser/SourceTypeConverter.java.orig       2005-04-09 13:57:05.000000000 +0000
  67 +++ eclipse-3.1/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/compiler/parser/SourceTypeConverter.java    2005-04-09 13:57:49.000000000 +0000
  68 @@ -166,10 +166,10 @@
  69         /*
  70          * Convert an initializerinfo into a parsed initializer declaration
  71          */
  72 -       private Initializer convert(InitializerElementInfo initializerInfo, CompilationResult compilationResult) throws JavaModelException {
  73 +       private org.eclipse.jdt.internal.compiler.ast.Initializer convert(InitializerElementInfo initializerInfo, CompilationResult compilationResult) throws JavaModelException {
  74
  75                 Block block = new Block(0);
  76 -               Initializer initializer = new Initializer(block, IConstants.AccDefault);
  77 +               org.eclipse.jdt.internal.compiler.ast.Initializer initializer = new org.eclipse.jdt.internal.compiler.ast.Initializer(block, IConstants.AccDefault);
  78
  79                 int start = initializerInfo.getDeclarationSourceStart();
  80                 int end = initializerInfo.getDeclarationSourceEnd();
  81 --- eclipse-3.1/plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/ModifyDialogTabPage.java.orig   2005-04-09 14:03:07.000000000 +0000
  82 +++ eclipse-3.1/plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/ModifyDialogTabPage.java        2005-04-09 14:03:27.000000000 +0000
  83 @@ -460,7 +460,7 @@
  84                         fItemMap.put(control, new Integer(fIndex++));
  85                 }
  86
  87 -               public void add(Preference preference) {
  88 +               public void add(ModifyDialogTabPage.Preference preference) {
  89                         final Control control= preference.getControl();
  90                         if (control != null)
  91                                 add(control);
  92 --- eclipse-3.1/plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/CommentsTabPage.java.orig       2005-04-09 14:03:58.000000000 +0000
  93 +++ eclipse-3.1/plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/CommentsTabPage.java    2005-04-09 14:05:50.000000000 +0000
  94 @@ -39,7 +39,7 @@
  95                         fMasters= masters;
  96                         fSlaves= slaves;
  97                         for (final Iterator iter= fMasters.iterator(); iter.hasNext();) {
  98 -                           ((CheckboxPreference)iter.next()).addObserver(this);
  99 +                           ((ModifyDialogTabPage.CheckboxPreference)iter.next()).addObserver(this);
 100                         }
 101                         update(null, null);
 102                 }
 103 @@ -48,13 +48,13 @@
 104                     boolean enabled= true;
 105
 106                     for (final Iterator iter= fMasters.iterator(); iter.hasNext();) {
 107 -                       enabled &= ((CheckboxPreference)iter.next()).getChecked();
 108 +                       enabled &= ((ModifyDialogTabPage.CheckboxPreference)iter.next()).getChecked();
 109                     }
 110
 111                         for (final Iterator iter = fSlaves.iterator(); iter.hasNext();) {
 112                             final Object obj= iter.next();
 113 -                           if (obj instanceof Preference) {
 114 -                               ((Preference)obj).setEnabled(enabled);
 115 +                           if (obj instanceof ModifyDialogTabPage.Preference) {
 116 +                               ((ModifyDialogTabPage.Preference)obj).setEnabled(enabled);
 117                             } else if (obj instanceof Control) {
 118                                 ((Group)obj).setEnabled(enabled);
 119                             }