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

Generics.

Browse source
This commit is contained in:
Sergey Prigogin 2010-05-02 21:34:09 +00:00
parent a93035a04c
commit e487384c29
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CHeuristicScannerTest.java
View file

@ -50,7 +50,7 @@ public class CHeuristicScannerTest extends TestCase {
*/ */
protected void setUp() { protected void setUp() {
if (CCorePlugin.getDefault() != null) { if (CCorePlugin.getDefault() != null) {
HashMap options= CCorePlugin.getDefaultOptions(); HashMap<String, String> options= CCorePlugin.getDefaultOptions();
options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, CCorePlugin.TAB); options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, CCorePlugin.TAB);
options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE, "4"); options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE, "4");
@ -839,6 +839,5 @@ public class CHeuristicScannerTest extends TestCase {
String indent= fScanner.computeIndentation(fDocument.getLength() - 8).toString(); String indent= fScanner.computeIndentation(fDocument.getLength() - 8).toString();
Assert.assertEquals(" ", indent); Assert.assertEquals(" ", indent);
} }
} }

2
core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CPartitionScanner.java
View file

@ -96,7 +96,7 @@ public class CPartitionScanner extends RuleBasedPartitionScanner implements ICPa
IToken single_comment= new Token(C_SINGLE_LINE_COMMENT); IToken single_comment= new Token(C_SINGLE_LINE_COMMENT);
IToken string= new Token(C_STRING); IToken string= new Token(C_STRING);
IToken character = new Token(C_CHARACTER); IToken character = new Token(C_CHARACTER);
List rules= new ArrayList(); List<IPredicateRule> rules= new ArrayList<IPredicateRule>();
// Minimize the number of rules, since we have duplicate rules // Minimize the number of rules, since we have duplicate rules
// in the CCodeScanner... // in the CCodeScanner...

4
core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/TemplateFormatterTest.java
View file

@ -55,7 +55,7 @@ public class TemplateFormatterTest extends BaseUITestCase {
private TemplateContextType fTemplateContextType; private TemplateContextType fTemplateContextType;
private String fSelection; private String fSelection;
private HashMap fDefaultOptions; private HashMap<String, String> fDefaultOptions;
@Override @Override
protected void setUp() throws Exception { protected void setUp() throws Exception {
@ -72,7 +72,7 @@ public class TemplateFormatterTest extends BaseUITestCase {
} }
private void setOption(String key, String value) { private void setOption(String key, String value) {
HashMap options= new HashMap(1); HashMap<String, String> options= new HashMap<String, String>(1);
options.put(key, value); options.put(key, value);
CCorePlugin.setOptions(options); CCorePlugin.setOptions(options);
} }