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