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.help.webapp/build.xml.orig  2005-04-09 10:59:29.000000000 +0000
  13 +++ eclipse-3.1/plugins/org.eclipse.help.webapp/build.xml       2005-04-09 10:59:35.000000000 +0000
  14 @@ -206,9 +206,6 @@
  15                                 <pathelement path="../org.eclipse.tomcat/jasper-runtime.jar"/>
  16                         </classpath>
  17                         <src path="${temp.folder}/jsp.jar.src/"                 />
  18 -<!-- custom begin -->
  19 -                       <compilerarg value="-warn:-serial" />
  20 -<!-- custom end -->
  21                         </javac>
  22                 <!-- Copy necessary resources -->
  23                 <copy todir="${temp.folder}/WEB-INF/lib/jsp.jar.bin" failonerror="true">
  24 --- 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
  25 +++ 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
  26 @@ -230,7 +230,7 @@
  27         }
  28
  29         public interface IFlushOperation {
  30 -               public void flush(ThreadInfo info, IProgressMonitor monitor) throws TeamException;
  31 +               public void flush(BatchingLock.ThreadInfo info, IProgressMonitor monitor) throws TeamException;
  32         }
  33
  34         private Map infos = new HashMap();
  35 --- 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
  36 +++ 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
  37 @@ -170,7 +170,7 @@
  38                  * @see org.eclipse.swt.events.DisposeListener#widgetDisposed(org.eclipse.swt.events.DisposeEvent)
  39                  */
  40                 public void widgetDisposed(DisposeEvent e) {
  41 -                       Item item= (Item) ((Widget) e.getSource()).getData();
  42 +                       AnnotationExpansionControl.Item item= (AnnotationExpansionControl.Item) ((Widget) e.getSource()).getData();
  43                         item.deselect();
  44                         item.canvas= null;
  45                         item.fAnnotation= null;
  46 --- 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
  47 +++ 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
  48 @@ -63,7 +63,7 @@
  49                 public boolean visit(FieldDeclaration fieldDeclaration, MethodScope scope) {
  50                         return false; // don't visit field declarations
  51                 }
  52 -               public boolean visit(Initializer initializer, MethodScope scope) {
  53 +               public boolean visit(org.eclipse.jdt.internal.compiler.ast.Initializer initializer, MethodScope scope) {
  54                         return false; // don't visit initializers
  55                 }
  56                 public boolean visit(ConstructorDeclaration constructorDeclaration, ClassScope scope) {
  57 --- 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
  58 +++ 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
  59 @@ -166,10 +166,10 @@
  60         /*
  61          * Convert an initializerinfo into a parsed initializer declaration
  62          */
  63 -       private Initializer convert(InitializerElementInfo initializerInfo, CompilationResult compilationResult) throws JavaModelException {
  64 +       private org.eclipse.jdt.internal.compiler.ast.Initializer convert(InitializerElementInfo initializerInfo, CompilationResult compilationResult) throws JavaModelException {
  65
  66                 Block block = new Block(0);
  67 -               Initializer initializer = new Initializer(block, IConstants.AccDefault);
  68 +               org.eclipse.jdt.internal.compiler.ast.Initializer initializer = new org.eclipse.jdt.internal.compiler.ast.Initializer(block, IConstants.AccDefault);
  69
  70                 int start = initializerInfo.getDeclarationSourceStart();
  71                 int end = initializerInfo.getDeclarationSourceEnd();
  72 --- 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
  73 +++ 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
  74 @@ -460,7 +460,7 @@
  75                         fItemMap.put(control, new Integer(fIndex++));
  76                 }
  77
  78 -               public void add(Preference preference) {
  79 +               public void add(ModifyDialogTabPage.Preference preference) {
  80                         final Control control= preference.getControl();
  81                         if (control != null)
  82                                 add(control);
  83 --- 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
  84 +++ 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
  85 @@ -39,7 +39,7 @@
  86                         fMasters= masters;
  87                         fSlaves= slaves;
  88                         for (final Iterator iter= fMasters.iterator(); iter.hasNext();) {
  89 -                           ((CheckboxPreference)iter.next()).addObserver(this);
  90 +                           ((ModifyDialogTabPage.CheckboxPreference)iter.next()).addObserver(this);
  91                         }
  92                         update(null, null);
  93                 }
  94 @@ -48,13 +48,13 @@
  95                     boolean enabled= true;
  96
  97                     for (final Iterator iter= fMasters.iterator(); iter.hasNext();) {
  98 -                       enabled &= ((CheckboxPreference)iter.next()).getChecked();
  99 +                       enabled &= ((ModifyDialogTabPage.CheckboxPreference)iter.next()).getChecked();
 100                     }
 101
 102                         for (final Iterator iter = fSlaves.iterator(); iter.hasNext();) {
 103                             final Object obj= iter.next();
 104 -                           if (obj instanceof Preference) {
 105 -                               ((Preference)obj).setEnabled(enabled);
 106 +                           if (obj instanceof ModifyDialogTabPage.Preference) {
 107 +                               ((ModifyDialogTabPage.Preference)obj).setEnabled(enabled);
 108                             } else if (obj instanceof Control) {
 109                                 ((Group)obj).setEnabled(enabled);
 110                             }
 111 --- eclipse-3.1/plugins/org.eclipse.jface.text/src/org/eclipse/jface/text/link/LinkedModeUI.java.orig   2005-06-27 20:54:39.000000000 +0200
 112 +++ eclipse-3.1/plugins/org.eclipse.jface.text/src/org/eclipse/jface/text/link/LinkedModeUI.java        2005-06-30 18:06:27.000000000 +0200
 113 @@ -164,7 +164,7 @@
 114                 Shell fShell;
 115
 116                 /** The registered listener, or <code>null</code>. */
 117 -               KeyListener fKeyListener;
 118 +               LinkedModeUI.KeyListener fKeyListener;
 119
 120                 /** The cached custom annotation model. */
 121                 LinkedPositionAnnotations fAnnotationModel;