| Index: editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/cleanup/CleanUpRefactoringWizard.java
|
| diff --git a/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/cleanup/CleanUpRefactoringWizard.java b/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/cleanup/CleanUpRefactoringWizard.java
|
| index ae88e996e6ed371ed951394ffdbff0b9be4b0bde..7b86cee6c2e8b24a12e6bf469a57d9f3d441396a 100644
|
| --- a/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/cleanup/CleanUpRefactoringWizard.java
|
| +++ b/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/cleanup/CleanUpRefactoringWizard.java
|
| @@ -27,6 +27,7 @@ import com.google.dart.tools.ui.internal.cleanup.migration.Migrate_1M1_library_C
|
| import com.google.dart.tools.ui.internal.cleanup.migration.Migrate_1M1_optionalNamed_CleanUp;
|
| import com.google.dart.tools.ui.internal.cleanup.migration.Migrate_1M1_parseNum_CleanUp;
|
| import com.google.dart.tools.ui.internal.cleanup.migration.Migrate_1M1_rawString_CleanUp;
|
| +import com.google.dart.tools.ui.internal.cleanup.migration.Migrate_1M2_removeInterface_CleanUp;
|
| import com.google.dart.tools.ui.internal.cleanup.migration.Migrate_1M2_renameTypes_CleanUp;
|
| import com.google.dart.tools.ui.internal.cleanup.migration.Migrate_1M2_toGetters_CleanUp;
|
| import com.google.dart.tools.ui.internal.cleanup.style.Style_trailingSpace_CleanUp;
|
| @@ -42,6 +43,7 @@ import org.eclipse.swt.SWT;
|
| import org.eclipse.swt.widgets.Button;
|
| import org.eclipse.swt.widgets.Composite;
|
| import org.eclipse.swt.widgets.Event;
|
| +import org.eclipse.swt.widgets.Label;
|
| import org.eclipse.swt.widgets.Listener;
|
| import org.eclipse.swt.widgets.TabFolder;
|
| import org.eclipse.swt.widgets.TabItem;
|
| @@ -64,6 +66,7 @@ public class CleanUpRefactoringWizard extends RefactoringWizard {
|
| private static final String ID_MIGRATE_SYNTAX_1M1_OPTIONAL_NAMED = "migrateSyntax-1M1-optionalNamed-whereSure";
|
| private static final String ID_MIGRATE_SYNTAX_1M2_GETTERS = "migrateSyntax-1M2-getters";
|
| private static final String ID_MIGRATE_SYNTAX_1M2_RENAME_TYPES = "migrateSyntax-1M2-renameExceptions";
|
| + private static final String ID_MIGRATE_SYNTAX_1M2_REMOVE_INTERFACE = "migrateSyntax-1M2-removeInterface";
|
|
|
| private static final String ID_STYLE_TRAILING_WHITESPACE = "style-trailingWhitespace";
|
| private static final String ID_STYLE_USE_BLOCKS = "style-useBlocks";
|
| @@ -80,6 +83,9 @@ public class CleanUpRefactoringWizard extends RefactoringWizard {
|
| CLEAN_UPS.put(ID_MIGRATE_SYNTAX_1M1_OPTIONAL_NAMED, new Migrate_1M1_optionalNamed_CleanUp());
|
| CLEAN_UPS.put(ID_MIGRATE_SYNTAX_1M2_GETTERS, new Migrate_1M2_toGetters_CleanUp());
|
| CLEAN_UPS.put(ID_MIGRATE_SYNTAX_1M2_RENAME_TYPES, new Migrate_1M2_renameTypes_CleanUp());
|
| + CLEAN_UPS.put(
|
| + ID_MIGRATE_SYNTAX_1M2_REMOVE_INTERFACE,
|
| + new Migrate_1M2_removeInterface_CleanUp());
|
| settings.setDefault(ID_MIGRATE_SYNTAX_1M1_CATCH, true);
|
| settings.setDefault(ID_MIGRATE_SYNTAX_1M1_GET, true);
|
| settings.setDefault(ID_MIGRATE_SYNTAX_1M1_RAW_STRING, true);
|
| @@ -89,6 +95,7 @@ public class CleanUpRefactoringWizard extends RefactoringWizard {
|
| settings.setDefault(ID_MIGRATE_SYNTAX_1M1_OPTIONAL_NAMED, false);
|
| settings.setDefault(ID_MIGRATE_SYNTAX_1M2_GETTERS, false);
|
| settings.setDefault(ID_MIGRATE_SYNTAX_1M2_RENAME_TYPES, false);
|
| + settings.setDefault(ID_MIGRATE_SYNTAX_1M2_REMOVE_INTERFACE, false);
|
| // style
|
| CLEAN_UPS.put(ID_STYLE_TRAILING_WHITESPACE, new Style_trailingSpace_CleanUp());
|
| CLEAN_UPS.put(ID_STYLE_USE_BLOCKS, new Style_useBlocks_CleanUp());
|
| @@ -167,8 +174,12 @@ public class CleanUpRefactoringWizard extends RefactoringWizard {
|
| syntaxComposite,
|
| ID_MIGRATE_SYNTAX_1M2_RENAME_TYPES,
|
| "Migrate to 1.0 M2 type names");
|
| -// new Label(syntaxComposite, SWT.NONE);
|
| -// new Label(syntaxComposite, SWT.NONE).setText("Work in progress... not fully implemented:");
|
| + new Label(syntaxComposite, SWT.NONE);
|
| + new Label(syntaxComposite, SWT.NONE).setText("Work in progress... not fully implemented:");
|
| + createCheckButton(
|
| + syntaxComposite,
|
| + ID_MIGRATE_SYNTAX_1M2_REMOVE_INTERFACE,
|
| + "Replace 'interface' with 'abstract class'");
|
| }
|
| }
|
| // Code Style
|
|
|