diff options
author | Bogdan Gheorghe | 2005-06-17 02:00:54 +0000 |
---|---|---|
committer | Bogdan Gheorghe | 2005-06-17 02:00:54 +0000 |
commit | e2daf28d350eec7c17520160e2a1995bc6b90b7d (patch) | |
tree | 1ce6745af0f59c6778604db0ed5f1789e17bbd06 | |
parent | a921b87b6f4f2b830d801a16769d702712c3a561 (diff) | |
download | org.eclipse.cdt-e2daf28d350eec7c17520160e2a1995bc6b90b7d.tar.gz org.eclipse.cdt-e2daf28d350eec7c17520160e2a1995bc6b90b7d.tar.xz org.eclipse.cdt-e2daf28d350eec7c17520160e2a1995bc6b90b7d.zip |
Fix for 99868
4 files changed, 18 insertions, 10 deletions
diff --git a/core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/MethodDeclarationPattern.java b/core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/MethodDeclarationPattern.java index d4b9f48e6ee..8fa4f5b8904 100644 --- a/core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/MethodDeclarationPattern.java +++ b/core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/MethodDeclarationPattern.java @@ -175,7 +175,7 @@ public class MethodDeclarationPattern extends CSearchPattern { int returnStart=0; int returnEnd=0; if (end != 0 && - end<missmatch.length){ + (end+1)<missmatch.length){ //Make sure that we have a parameter string and that there is still something left //to be decoded @@ -199,10 +199,18 @@ public class MethodDeclarationPattern extends CSearchPattern { for (int i=start+1; i<end; i++){ decodedParameters[counter++]=missmatch[i].toCharArray(); } - this.decodedQualifications = new char[missmatch.length - (returnEnd + 1)][]; - counter=0; - for (int i = returnEnd + 1; i < missmatch.length; i++) - this.decodedQualifications[counter++] = missmatch[i].toCharArray(); + + if (returnEnd != 0){ + this.decodedQualifications = new char[missmatch.length - (returnEnd + 1)][]; + counter=0; + for (int i = returnEnd + 1; i < missmatch.length; i++) + this.decodedQualifications[counter++] = missmatch[i].toCharArray(); + } else { + this.decodedQualifications = new char[missmatch.length - (end + 1)][]; + counter=0; + for (int i = end + 1; i < missmatch.length; i++) + this.decodedQualifications[counter++] = missmatch[i].toCharArray(); + } } else { this.decodedParameters = new char[0][]; this.decodedQualifications = new char[missmatch.length][]; diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/regression/RegressionTestsUISuite.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/regression/RegressionTestsUISuite.java index 645265d0458..fa463175141 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/regression/RegressionTestsUISuite.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/regression/RegressionTestsUISuite.java @@ -41,9 +41,9 @@ public class RegressionTestsUISuite extends TestSuite { final RegressionTestsUISuite suite = new RegressionTestsUISuite(); suite.addTest( ContentAssistRegressionTests.suite( false ) ); - suite.addTest( RefactoringRegressionTests.suite( false ) ); + //suite.addTest( RefactoringRegressionTests.suite( false ) ); - suite.addTest( new RefactoringRegressionTests("cleanupProject") ); //$NON-NLS-1$ + //suite.addTest( new RefactoringRegressionTests("cleanupProject") ); //$NON-NLS-1$ return suite; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchPage.java index a49e48e6a47..1cd41f0076c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchPage.java @@ -333,7 +333,7 @@ public class CSearchPage extends DialogPage implements ISearchPage, ICSearchCons private void setLimitTo( List searchFor ) { HashSet set = new HashSet(); - set.add( DECLARATIONS ); + set.add( DECLARATIONS_DEFINITIONS ); set.add( REFERENCES ); set.add( ALL_OCCURRENCES ); @@ -662,7 +662,7 @@ public class CSearchPage extends DialogPage implements ISearchPage, ICSearchCons private Button[] fLimitTo; private final static int LIMIT_TO_ALL = 3; private final static int LIMIT_TO_DEFINITIONS = 1; - private LimitTo[] fLimitToValues = { DECLARATIONS, DEFINITIONS, REFERENCES, ALL_OCCURRENCES }; + private LimitTo[] fLimitToValues = { DECLARATIONS_DEFINITIONS, DEFINITIONS, REFERENCES, ALL_OCCURRENCES }; private String[] fLimitToText= { CSearchMessages.getString("CSearchPage.limitTo.declarations"), //$NON-NLS-1$ CSearchMessages.getString("CSearchPage.limitTo.definitions"), //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/OpenDeclarationsAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/OpenDeclarationsAction.java index 97ae0b048b1..19c6e388ee7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/OpenDeclarationsAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/OpenDeclarationsAction.java @@ -166,7 +166,7 @@ public class OpenDeclarationsAction extends SelectionParseAction implements IUpd // step 3 starts here ICElement[] scope = new ICElement[1]; scope[0] = new CProject(null, fEditor.getInputFile().getProject()); - Set matches = DOMSearchUtil.getMatchesFromSearchEngine(SearchEngine.createCSearchScope(scope), searchName, ICSearchConstants.DECLARATIONS); + Set matches = DOMSearchUtil.getMatchesFromSearchEngine(SearchEngine.createCSearchScope(scope), searchName, ICSearchConstants.DECLARATIONS_DEFINITIONS); if (matches != null && matches.size() > 0) { Iterator itr = matches.iterator(); |