From 9d6ba54b08e67407bc882ca52ee6c643de3628bf Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Fri, 4 Nov 2016 11:07:46 +0100 Subject: [PATCH] cleanup --- .../ide/util/ProjectPropertiesComponentImpl.java | 5 +---- .../changes/patch/CreatePatchCommitExecutor.java | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/platform/projectModel-impl/src/com/intellij/ide/util/ProjectPropertiesComponentImpl.java b/platform/projectModel-impl/src/com/intellij/ide/util/ProjectPropertiesComponentImpl.java index 5d40de61a712..d7d6de0a60b5 100644 --- a/platform/projectModel-impl/src/com/intellij/ide/util/ProjectPropertiesComponentImpl.java +++ b/platform/projectModel-impl/src/com/intellij/ide/util/ProjectPropertiesComponentImpl.java @@ -19,9 +19,6 @@ import com.intellij.openapi.components.State; import com.intellij.openapi.components.Storage; import com.intellij.openapi.components.StoragePathMacros; -@State( - name = "PropertiesComponent", - storages = {@Storage(StoragePathMacros.WORKSPACE_FILE)} -) +@State(name = "PropertiesComponent", storages = @Storage(StoragePathMacros.WORKSPACE_FILE)) public class ProjectPropertiesComponentImpl extends PropertiesComponentImpl { } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/CreatePatchCommitExecutor.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/CreatePatchCommitExecutor.java index 76c682b2f464..5980fa9d44ae 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/CreatePatchCommitExecutor.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/CreatePatchCommitExecutor.java @@ -73,6 +73,7 @@ public class CreatePatchCommitExecutor extends LocalCommitExecutor implements Pr myChangeListManager = changeListManager; } + @Override @Nls public String getActionText() { return "Create Patch..."; @@ -83,34 +84,42 @@ public class CreatePatchCommitExecutor extends LocalCommitExecutor implements Pr return "reference.dialogs.vcs.patch.create"; } + @Override @NotNull public CommitSession createCommitSession() { return new CreatePatchCommitSession(); } + @Override public void projectOpened() { myChangeListManager.registerCommitExecutor(this); } + @Override public void projectClosed() { } + @Override @NonNls @NotNull public String getComponentName() { return "CreatePatchCommitExecutor"; } + @Override public void initComponent() { } + @Override public void disposeComponent() { } + @Override public void readExternal(Element element) throws InvalidDataException { DefaultJDOMExternalizer.readExternal(this, element); } + @Override public void writeExternal(Element element) throws WriteExternalException { DefaultJDOMExternalizer.writeExternal(this, element); } @@ -127,11 +136,13 @@ public class CreatePatchCommitExecutor extends LocalCommitExecutor implements Pr myCommitContext = context; } + @Override @Nullable public JComponent getAdditionalConfigurationUI() { return myPanel.getPanel(); } + @Override public JComponent getAdditionalConfigurationUI(final Collection changes, final String commitMessage) { if (PATCH_PATH.length() == 0) { VcsApplicationSettings settings = VcsApplicationSettings.getInstance(); @@ -157,10 +168,12 @@ public class CreatePatchCommitExecutor extends LocalCommitExecutor implements Pr return panel; } + @Override public boolean canExecute(Collection changes, String commitMessage) { return myPanel.isOkToExecute(); } + @Override public void execute(Collection changes, String commitMessage) { final String fileName = myPanel.getFileName(); final File file = new File(fileName).getAbsoluteFile(); @@ -211,6 +224,7 @@ public class CreatePatchCommitExecutor extends LocalCommitExecutor implements Pr } } + @Override public void executionCanceled() { }