MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[patch]: style: use client property instead of component.setName hacky method

Browse Source
This commit is contained in:
Nadya Zabrodina
2015-10-16 12:05:20 +03:00
parent 6386345f62
commit e937fc7ddc
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/CreatePatchCommitExecutor.java
+4 -3
View File
@@ -36,6 +36,7 @@ import com.intellij.openapi.vcs.VcsBundle;
import com.intellij.openapi.vcs.VcsConfiguration;
import com.intellij.openapi.vcs.changes.*;
import com.intellij.openapi.vcs.changes.shelf.ShelveChangesManager;
import com.intellij.openapi.vcs.changes.ui.SessionDialog;
import com.intellij.util.WaitForProgressToShow;
import com.intellij.util.containers.ContainerUtil;
import org.jdom.Element;
@@ -144,9 +145,9 @@ public class CreatePatchCommitExecutor extends LocalCommitExecutor implements Pr
}
}));
myPanel.showTextStoreOption();
JComponent component = myPanel.getPanel();
component.setName("Patch File Settings");
return component;
JComponent panel = myPanel.getPanel();
panel.putClientProperty(SessionDialog.VCS_CONFIGURATION_UI_TITLE, "Patch File Settings");
return panel;
}
public boolean canExecute(Collection<Change> changes, String commitMessage) {
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/SessionDialog.java
+7 -1
View File
@@ -24,6 +24,7 @@ import com.intellij.openapi.vcs.changes.Change;
import com.intellij.openapi.vcs.changes.CommitSession;
import com.intellij.openapi.wm.ex.IdeFocusTraversalPolicy;
import com.intellij.util.Alarm;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
@@ -31,6 +32,9 @@ import java.awt.*;
import java.util.List;
public class SessionDialog extends DialogWrapper {
@NonNls public static final String VCS_CONFIGURATION_UI_TITLE = "Vcs.SessionDialog.title";
private final CommitSession mySession;
private final List<Change> myChanges;
@@ -49,7 +53,8 @@ public class SessionDialog extends DialogWrapper {
myCommitMessage = commitMessage;
myConfigurationComponent =
configurationComponent == null ? createConfigurationUI(mySession, myChanges, myCommitMessage) : configurationComponent;
String configurationComponentName = myConfigurationComponent.getName();
String configurationComponentName =
myConfigurationComponent != null ? (String)myConfigurationComponent.getClientProperty(VCS_CONFIGURATION_UI_TITLE) : null;
setTitle(StringUtil.isEmptyOrSpaces(configurationComponentName)
? CommitChangeListDialog.trimEllipsis(title) : configurationComponentName);
init();
@@ -62,6 +67,7 @@ public class SessionDialog extends DialogWrapper {
this(title, project, session, changes, commitMessage, null);
}
@Nullable
public static JComponent createConfigurationUI(final CommitSession session, final List<Change> changes, final String commitMessage) {
try {
return session.getAdditionalConfigurationUI(changes, commitMessage);