From 3be23a2cd63d5032a1cf3c73493d046088f4efc2 Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Tue, 1 Nov 2011 18:02:23 +0400 Subject: [PATCH] extra borders removed --- .../com/intellij/openapi/vcs/changes/ChangesViewManager.java | 1 - .../svn4idea/src/org/jetbrains/idea/svn/SvnBundle.properties | 2 +- .../src/org/jetbrains/idea/svn/WorkingCopiesContent.java | 2 +- .../src/org/jetbrains/idea/svn/actions/ShowSvnMapAction.java | 2 +- .../src/org/jetbrains/idea/svn/dialogs/CopiesPanel.java | 3 ++- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesViewManager.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesViewManager.java index 42a3ee435efc..6abddc827ecb 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesViewManager.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesViewManager.java @@ -231,7 +231,6 @@ public class ChangesViewManager implements ChangesViewI, JDOMExternalizable, Pro mySplitter = new Splitter(false, 0.5f); final JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myView); final JPanel wrapper = new JPanel(new BorderLayout()); - wrapper.setBorder(BorderFactory.createLineBorder(UIUtil.getBorderColor())); wrapper.add(scrollPane, BorderLayout.CENTER); mySplitter.setShowDividerControls(true); mySplitter.setFirstComponent(wrapper); diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnBundle.properties b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnBundle.properties index bb03dc312d59..81b1a3b00e96 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnBundle.properties +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnBundle.properties @@ -515,7 +515,7 @@ progress.live.provider.loading.revisions.details.text=Loading revisions from ser action.show.svn.map.text=Show Working Copies... action.show.svn.map.text.reference=Show Working Copies action.show.svn.map.description=Shows working copies information: working copy formats and URLs -dialog.show.svn.map.title=Subversion Working Copies information +dialog.show.svn.map.title=Subversion Working Copies Information dialog.show.svn.map.label.table.header=Detected working copies dialog.show.svn.map.change.format.button.text=&Change Working Copy Format dialog.show.svn.map.table.header.column.wcpath.title=Root path diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/WorkingCopiesContent.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/WorkingCopiesContent.java index 1c71a8201490..44fceb4fbe01 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/WorkingCopiesContent.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/WorkingCopiesContent.java @@ -37,7 +37,7 @@ public class WorkingCopiesContent { myShownContent = contentFactory.createContent(copiesPanel.getComponent(), SvnBundle.message("dialog.show.svn.map.title"), true); myShownContent.setCloseable(false); cvcm.addContent(myShownContent); - myShownContent.setPreferredFocusableComponent(copiesPanel.getPrefferedFocusComponent()); + myShownContent.setPreferredFocusableComponent(copiesPanel.getPreferredFocusedComponent()); } public void deactivate() { diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShowSvnMapAction.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShowSvnMapAction.java index 39c0284e913e..487180bbaea4 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShowSvnMapAction.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShowSvnMapAction.java @@ -66,7 +66,7 @@ public class ShowSvnMapAction extends AnAction implements DumbAware { ContentsUtil.addOrReplaceContent(contentManager, content, true); toolWindow.activate(new Runnable() { public void run() { - IdeFocusManager.getInstance(project).requestFocus(copiesPanel.getPrefferedFocusComponent(), true); + IdeFocusManager.getInstance(project).requestFocus(copiesPanel.getPreferredFocusedComponent(), true); } }); /*SwingUtilities.invokeLater(new Runnable() { diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/CopiesPanel.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/CopiesPanel.java index c5e14244a155..415ae3db7134 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/CopiesPanel.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/CopiesPanel.java @@ -123,12 +123,13 @@ public class CopiesPanel { } }); myHolder = ScrollPaneFactory.createScrollPane(holderPanel); + myHolder.setBorder(null); setFocusableForLinks(myRefreshLabel); refreshView.run(); initView(); } - public JComponent getPrefferedFocusComponent() { + public JComponent getPreferredFocusedComponent() { return myRefreshLabel; }