mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-29 03:45:35 +02:00
Code Issues Wiki Activity

Patch for Bogdan

Browse source
This commit is contained in:
Hoda Amer 2003-11-11 18:25:56 +00:00
parent d655eed877
commit 757922dcc2
4 changed files with 114 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

122
core/org.eclipse.cdt.core/dependency/ChangeLog
View file

@ -1,60 +1,64 @@
2003-10-23 Bogdan Gheorghe 2003-11-10 Bogdan Gheorghe
- Added UpdateDependency job - Added a null resource check in UpdateDependency to fix up
a potential NPE in the test suite
2003-09-25 Bogdan Gheorghe
- As a result of folding the dependency service into the indexer 2003-10-23 Bogdan Gheorghe
have removed the following files: - Added UpdateDependency job
* src/org/eclipse/cdt/internal/core/sourcedependency/AddFileToDependencyTree.java 2003-09-25 Bogdan Gheorghe
* src/org/eclipse/cdt/internal/core/sourcedependency/DependencyManager.java - As a result of folding the dependency service into the indexer
* src/org/eclipse/cdt/internal/core/sourcedependency/DependencyRequest.java have removed the following files:
* src/org/eclipse/cdt/internal/core/sourcedependency/DependencyRequestor.java
* src/org/eclipse/cdt/internal/core/sourcedependency/DependencySelector.java * src/org/eclipse/cdt/internal/core/sourcedependency/AddFileToDependencyTree.java
* src/org/eclipse/cdt/internal/core/sourcedependency/DependencyTree.java * src/org/eclipse/cdt/internal/core/sourcedependency/DependencyManager.java
* src/org/eclipse/cdt/internal/core/sourcedependency/EntireProjectDependencyTree.java * src/org/eclipse/cdt/internal/core/sourcedependency/DependencyRequest.java
* src/org/eclipse/cdt/internal/core/sourcedependency/IDependencyTree.java * src/org/eclipse/cdt/internal/core/sourcedependency/DependencyRequestor.java
* src/org/eclipse/cdt/internal/core/sourcedependency/IPreprocessorOutput.java * src/org/eclipse/cdt/internal/core/sourcedependency/DependencySelector.java
* src/org/eclipse/cdt/internal/core/sourcedependency/ISourceDependency.java * src/org/eclipse/cdt/internal/core/sourcedependency/DependencyTree.java
* src/org/eclipse/cdt/internal/core/sourcedependency/PreprocessorOutput.java * src/org/eclipse/cdt/internal/core/sourcedependency/EntireProjectDependencyTree.java
* src/org/eclipse/cdt/internal/core/sourcedependency/RemoveFromDependencyTree.java * src/org/eclipse/cdt/internal/core/sourcedependency/IDependencyTree.java
* src/org/eclipse/cdt/internal/core/sourcedependency/impl/IncludeEntry.java * src/org/eclipse/cdt/internal/core/sourcedependency/IPreprocessorOutput.java
* src/org/eclipse/cdt/internal/core/sourcedependency/impl/IncludeEntryHashedArray.java * src/org/eclipse/cdt/internal/core/sourcedependency/ISourceDependency.java
* src/org/eclipse/cdt/internal/core/sourcedependency/impl/InMemoryTree.java * src/org/eclipse/cdt/internal/core/sourcedependency/PreprocessorOutput.java
* src/org/eclipse/cdt/internal/core/sourcedependency/RemoveFromDependencyTree.java
* src/org/eclipse/cdt/internal/core/sourcedependency/impl/IncludeEntry.java
* src/org/eclipse/cdt/internal/core/sourcedependency/impl/IncludeEntryHashedArray.java
2003-09-22 Bogdan Gheorghe * src/org/eclipse/cdt/internal/core/sourcedependency/impl/InMemoryTree.java
- Took out enable section for DependencyManager
2003-09-11 Bogdan Gheorghe
- Added null guard to DependencyManager.getDependencyTree(), 2003-09-22 Bogdan Gheorghe
DependencyTree.getFileDependencies() - Took out enable section for DependencyManager
2003-09-08 Andrew Niefer 2003-09-11 Bogdan Gheorghe
- Modified calls to ParserFactory to specify which language to use - Added null guard to DependencyManager.getDependencyTree(),
- Modified IDependencyTree.add to take ParserLanguage as a parameter so that it can DependencyTree.getFileDependencies()
be passed on when creating the preprocessor
2003-09-08 Andrew Niefer
2003-07-23 Bogdan Gheorghe - Modified calls to ParserFactory to specify which language to use
- Modified IDependencyTree.add to take ParserLanguage as a parameter so that it can
Added initial dependency implementation be passed on when creating the preprocessor
* src/org/eclipse/cdt/internal/core/sourcedependency/AddFileToDependencyTree.java 2003-07-23 Bogdan Gheorghe
* src/org/eclipse/cdt/internal/core/sourcedependency/DependencyManager.java
* src/org/eclipse/cdt/internal/core/sourcedependency/DenpendencyQueryJob.java Added initial dependency implementation
* src/org/eclipse/cdt/internal/core/sourcedependency/DependencyRequest.java
* src/org/eclipse/cdt/internal/core/sourcedependency/DependencyRequestor.java * src/org/eclipse/cdt/internal/core/sourcedependency/AddFileToDependencyTree.java
* src/org/eclipse/cdt/internal/core/sourcedependency/DependencyTree.java * src/org/eclipse/cdt/internal/core/sourcedependency/DependencyManager.java
* src/org/eclipse/cdt/internal/core/sourcedependency/EntireProjectDependencyTree.java * src/org/eclipse/cdt/internal/core/sourcedependency/DenpendencyQueryJob.java
* src/org/eclipse/cdt/internal/core/sourcedependency/IDependencyTree.java * src/org/eclipse/cdt/internal/core/sourcedependency/DependencyRequest.java
* src/org/eclipse/cdt/internal/core/sourcedependency/IPreprocessorOutput.java * src/org/eclipse/cdt/internal/core/sourcedependency/DependencyRequestor.java
* src/org/eclipse/cdt/internal/core/sourcedependency/ISourceDependency.java * src/org/eclipse/cdt/internal/core/sourcedependency/DependencyTree.java
* src/org/eclipse/cdt/internal/core/sourcedependency/PreprocessorOutput.java * src/org/eclipse/cdt/internal/core/sourcedependency/EntireProjectDependencyTree.java
* src/org/eclipse/cdt/internal/core/sourcedependency/IDependencyTree.java
* src/org/eclipse/cdt/internal/core/sourcedependency/impl/IncludeEntry.java * src/org/eclipse/cdt/internal/core/sourcedependency/IPreprocessorOutput.java
* src/org/eclipse/cdt/internal/core/sourcedependency/impl/IncludeEntryHashedArray.java * src/org/eclipse/cdt/internal/core/sourcedependency/ISourceDependency.java
* src/org/eclipse/cdt/internal/core/sourcedependency/impl/InMemoryTree.java * src/org/eclipse/cdt/internal/core/sourcedependency/PreprocessorOutput.java
* src/org/eclipse/cdt/internal/core/sourcedependency/impl/Node.java
* src/org/eclipse/cdt/internal/core/sourcedependency/impl/IncludeEntry.java
- * src/org/eclipse/cdt/internal/core/sourcedependency/impl/IncludeEntryHashedArray.java
* src/org/eclipse/cdt/internal/core/sourcedependency/impl/InMemoryTree.java
* src/org/eclipse/cdt/internal/core/sourcedependency/impl/Node.java
-

4
core/org.eclipse.cdt.core/dependency/org/eclipse/cdt/internal/core/sourcedependency/UpdateDependency.java
View file

@ -58,7 +58,9 @@ public class UpdateDependency implements IJob {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.internal.core.search.processing.IJob#execute(org.eclipse.core.runtime.IProgressMonitor) * @see org.eclipse.cdt.internal.core.search.processing.IJob#execute(org.eclipse.core.runtime.IProgressMonitor)
*/ */
public boolean execute(IProgressMonitor progress) { public boolean execute(IProgressMonitor progress) {
if (resource == null) return false;
PathCollector pathCollector = new PathCollector(); PathCollector pathCollector = new PathCollector();
//SubProgressMonitor subMonitor = (progressMonitor == null ) ? null : new SubProgressMonitor( progressMonitor, 5 ); //SubProgressMonitor subMonitor = (progressMonitor == null ) ? null : new SubProgressMonitor( progressMonitor, 5 );
ICSearchScope scope = SearchEngine.createWorkspaceScope(); ICSearchScope scope = SearchEngine.createWorkspaceScope();

3
core/org.eclipse.cdt.ui/ChangeLog
View file

@ -1,3 +1,6 @@
2003-11-10 Bogdan Gheorghe
fix bug 45688: must highlight keyword to use "Open Declarations" or "Add Include"
2003-11-05 John Camelon 2003-11-05 John Camelon
Updated parser clients to use new ParserFactory (stand-alone parser work item). Updated parser clients to use new ParserFactory (stand-alone parser work item).

46
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OpenDeclarationsAction.java
View file

@ -27,12 +27,14 @@ import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProject;
import org.eclipse.jface.action.Action; import org.eclipse.jface.action.Action;
import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.ITextSelection; import org.eclipse.jface.text.ITextSelection;
import org.eclipse.jface.window.Window; import org.eclipse.jface.window.Window;
import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.PartInitException; import org.eclipse.ui.PartInitException;
import org.eclipse.ui.texteditor.IDocumentProvider;
/** /**
* This action opens a java CEditor on the element represented by text selection of * This action opens a java CEditor on the element represented by text selection of
@ -105,6 +107,15 @@ public class OpenDeclarationsAction extends Action {
try { try {
ArrayList elementsFound = new ArrayList(); ArrayList elementsFound = new ArrayList();
String sel = selection.getText(); String sel = selection.getText();
if (sel.equals(""))
{
int selStart = selection.getOffset();
IDocumentProvider prov = fEditor.getDocumentProvider();
IDocument doc = prov.getDocument(fEditor.getEditorInput());
sel = getSelection(doc, selStart);
}
IFile file = fEditor.getInputFile(); IFile file = fEditor.getInputFile();
if(file == null) if(file == null)
return; return;
@ -202,6 +213,39 @@ public class OpenDeclarationsAction extends Action {
} }
} }
return null; return null;
} }
public String getSelection(IDocument doc, int fPos){
int pos= fPos;
char c;
int fStartPos =0, fEndPos=0;
String selectedWord=null;
try{
while (pos >= 0) {
c= doc.getChar(pos);
if (!Character.isJavaIdentifierPart(c))
break;
--pos;
}
fStartPos= pos + 1;
pos= fPos;
int length= doc.getLength();
while (pos < length) {
c= doc.getChar(pos);
if (!Character.isJavaIdentifierPart(c))
break;
++pos;
}
fEndPos= pos;
selectedWord = doc.get(fStartPos, (fEndPos - fStartPos));
}
catch(BadLocationException e){
}
return selectedWord;
}
} }