|
Lines 1-5
Link Here
|
| 1 |
/******************************************************************************* |
1 |
/******************************************************************************* |
| 2 |
* Copyright (c) 2000, 2012 IBM Corporation and others. |
2 |
* Copyright (c) 2000, 2013 IBM Corporation and others. |
| 3 |
* All rights reserved. This program and the accompanying materials |
3 |
* All rights reserved. This program and the accompanying materials |
| 4 |
* are made available under the terms of the Eclipse Public License v1.0 |
4 |
* are made available under the terms of the Eclipse Public License v1.0 |
| 5 |
* which accompanies this distribution, and is available at |
5 |
* which accompanies this distribution, and is available at |
|
Lines 3442-3447
Link Here
|
| 3442 |
assertRefactoringResultAsExpected(new ICompilationUnit[] { cu1 }, new String[] { expected1 }); |
3442 |
assertRefactoringResultAsExpected(new ICompilationUnit[] { cu1 }, new String[] { expected1 }); |
| 3443 |
} |
3443 |
} |
| 3444 |
|
3444 |
|
|
|
3445 |
public void testCodeStyleBug346230() throws Exception { |
| 3446 |
IJavaProject project= JavaProjectHelper.createJavaProject("CleanUpTestProject", "bin"); |
| 3447 |
JavaProjectHelper.addRTJar16(project); |
| 3448 |
IPackageFragmentRoot src= JavaProjectHelper.addSourceContainer(project, "src"); |
| 3449 |
IPackageFragment pack1= src.createPackageFragment("test1", false, null); |
| 3450 |
|
| 3451 |
StringBuffer buf= new StringBuffer(); |
| 3452 |
buf.append("package test1;\n"); |
| 3453 |
buf.append("interface CinematicEvent {\n"); |
| 3454 |
buf.append(" public void stop();\n"); |
| 3455 |
buf.append(" public boolean internalUpdate();\n"); |
| 3456 |
buf.append("}\n"); |
| 3457 |
ICompilationUnit cu1= pack1.createCompilationUnit("CinematicEvent.java", buf.toString(), false, null); |
| 3458 |
|
| 3459 |
buf= new StringBuffer(); |
| 3460 |
buf.append("package test1;\n"); |
| 3461 |
buf.append("abstract class E1 implements CinematicEvent {\n"); |
| 3462 |
buf.append("\n"); |
| 3463 |
buf.append(" protected PlayState playState = PlayState.Stopped;\n"); |
| 3464 |
buf.append(" protected LoopMode loopMode = LoopMode.DontLoop;\n"); |
| 3465 |
buf.append("\n"); |
| 3466 |
buf.append(" public boolean internalUpdate() {\n"); |
| 3467 |
buf.append(" return loopMode == loopMode.DontLoop;\n"); |
| 3468 |
buf.append(" }\n"); |
| 3469 |
buf.append("\n"); |
| 3470 |
buf.append(" public void stop() {\n"); |
| 3471 |
buf.append(" }\n"); |
| 3472 |
buf.append("\n"); |
| 3473 |
buf.append(" public void read() {\n"); |
| 3474 |
buf.append(" Object ic= new Object();\n"); |
| 3475 |
buf.append(" playState.toString();\n"); |
| 3476 |
buf.append(" }\n"); |
| 3477 |
buf.append("\n"); |
| 3478 |
buf.append(" enum PlayState {\n"); |
| 3479 |
buf.append(" Stopped\n"); |
| 3480 |
buf.append(" }\n"); |
| 3481 |
buf.append(" enum LoopMode {\n"); |
| 3482 |
buf.append(" DontLoop\n"); |
| 3483 |
buf.append(" }\n"); |
| 3484 |
buf.append("}\n"); |
| 3485 |
ICompilationUnit cu2= pack1.createCompilationUnit("E1.java", buf.toString(), false, null); |
| 3486 |
|
| 3487 |
enable(CleanUpConstants.MEMBER_ACCESSES_NON_STATIC_FIELD_USE_THIS); |
| 3488 |
enable(CleanUpConstants.MEMBER_ACCESSES_NON_STATIC_FIELD_USE_THIS_ALWAYS); |
| 3489 |
enable(CleanUpConstants.MEMBER_ACCESSES_STATIC_QUALIFY_WITH_DECLARING_CLASS); |
| 3490 |
enable(CleanUpConstants.MEMBER_ACCESSES_STATIC_QUALIFY_WITH_DECLARING_CLASS_INSTANCE_ACCESS); |
| 3491 |
enable(CleanUpConstants.VARIABLE_DECLARATIONS_USE_FINAL); |
| 3492 |
enable(CleanUpConstants.VARIABLE_DECLARATIONS_USE_FINAL_LOCAL_VARIABLES); |
| 3493 |
enable(CleanUpConstants.ADD_MISSING_ANNOTATIONS); |
| 3494 |
enable(CleanUpConstants.ADD_MISSING_ANNOTATIONS_OVERRIDE); |
| 3495 |
enable(CleanUpConstants.ADD_MISSING_ANNOTATIONS_OVERRIDE_FOR_INTERFACE_METHOD_IMPLEMENTATION); |
| 3496 |
|
| 3497 |
buf= new StringBuffer(); |
| 3498 |
buf.append("package test1;\n"); |
| 3499 |
buf.append("abstract class E1 implements CinematicEvent {\n"); |
| 3500 |
buf.append("\n"); |
| 3501 |
buf.append(" protected PlayState playState = PlayState.Stopped;\n"); |
| 3502 |
buf.append(" protected LoopMode loopMode = LoopMode.DontLoop;\n"); |
| 3503 |
buf.append("\n"); |
| 3504 |
buf.append(" @Override\n"); |
| 3505 |
buf.append(" public boolean internalUpdate() {\n"); |
| 3506 |
buf.append(" return this.loopMode == LoopMode.DontLoop;\n"); |
| 3507 |
buf.append(" }\n"); |
| 3508 |
buf.append("\n"); |
| 3509 |
buf.append(" @Override\n"); |
| 3510 |
buf.append(" public void stop() {\n"); |
| 3511 |
buf.append(" }\n"); |
| 3512 |
buf.append("\n"); |
| 3513 |
buf.append(" public void read() {\n"); |
| 3514 |
buf.append(" final Object ic= new Object();\n"); |
| 3515 |
buf.append(" this.playState.toString();\n"); |
| 3516 |
buf.append(" }\n"); |
| 3517 |
buf.append("\n"); |
| 3518 |
buf.append(" enum PlayState {\n"); |
| 3519 |
buf.append(" Stopped\n"); |
| 3520 |
buf.append(" }\n"); |
| 3521 |
buf.append(" enum LoopMode {\n"); |
| 3522 |
buf.append(" DontLoop\n"); |
| 3523 |
buf.append(" }\n"); |
| 3524 |
buf.append("}\n"); |
| 3525 |
String expected1= buf.toString(); |
| 3526 |
|
| 3527 |
assertRefactoringResultAsExpected(new ICompilationUnit[] { cu1, cu2 }, new String[] { cu1.getBuffer().getContents(), expected1 }); |
| 3528 |
} |
| 3529 |
|
| 3445 |
public void testCodeStyle_StaticAccessThroughInstance_Bug307407() throws Exception { |
3530 |
public void testCodeStyle_StaticAccessThroughInstance_Bug307407() throws Exception { |
| 3446 |
IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null); |
3531 |
IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null); |
| 3447 |
StringBuffer buf= new StringBuffer(); |
3532 |
StringBuffer buf= new StringBuffer(); |
