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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Dmitry Trofimov
2014-01-22 21:02:12 +01:00
parent 56c1793f3f 3087918817
commit 11a158b7c4
10 changed files with 85 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/editor-ui-api/src/com/intellij/openapi/actionSystem/ActionGroup.java
+3
View File
@@ -28,6 +28,9 @@ import java.util.Set;
/**
* Represents a group of actions.
*
* @see com.intellij.openapi.actionSystem.DefaultActionGroup
* @see com.intellij.openapi.actionSystem.ComputableActionGroup
*/
public abstract class ActionGroup extends AnAction {
private boolean myPopup;
platform/lang-impl/src/com/intellij/codeEditor/printing/ExportToHTMLAction.java
+1
View File
@@ -55,6 +55,7 @@ public class ExportToHTMLAction extends AnAction {
}
PsiFile psiFile = CommonDataKeys.PSI_FILE.getData(dataContext);
presentation.setEnabled(psiFile != null && psiFile.getContainingDirectory() != null);
presentation.setVisible(psiFile != null);
}
}
platform/lang-impl/src/com/intellij/ide/projectView/actions/MarkRootGroup.java
+2 -9
View File
@@ -15,17 +15,10 @@
*/
package com.intellij.ide.projectView.actions;
import com.intellij.openapi.actionSystem.ActionGroupUtil;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.DefaultActionGroup;
import com.intellij.openapi.project.DumbAware;
import com.intellij.ide.actions.NonTrivialActionGroup;
/**
* @author yole
*/
public class MarkRootGroup extends DefaultActionGroup implements DumbAware {
@Override
public void update(AnActionEvent e) {
e.getPresentation().setVisible(!ActionGroupUtil.isGroupEmpty(this, e));
}
public class MarkRootGroup extends NonTrivialActionGroup {
}
platform/platform-api/src/com/intellij/openapi/actionSystem/DefaultActionGroup.java
+7 -1
View File
@@ -35,7 +35,13 @@ import java.util.List;
* to implement your own <code>ActionGroup</code>.
*
* @see Constraints
* @see ComputableActionGroup
*
* @see com.intellij.openapi.actionSystem.ComputableActionGroup
*
* @see com.intellij.ide.actions.NonEmptyActionGroup
* @see com.intellij.ide.actions.NonTrivialActionGroup
* @see com.intellij.ide.actions.SmartPopupActionGroup
*
*/
public class DefaultActionGroup extends ActionGroup {
private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.actionSystem.DefaultActionGroup");
platform/platform-impl/src/com/intellij/ide/actions/NonEmptyActionGroup.java
+6
View File
@@ -20,6 +20,12 @@ import com.intellij.openapi.actionSystem.DefaultActionGroup;
import com.intellij.openapi.actionSystem.Presentation;
import com.intellij.openapi.project.DumbAware;
/**
* This group hides itself when there's no registered children.
*
* @see com.intellij.ide.actions.SmartPopupActionGroup
* @see com.intellij.ide.actions.NonTrivialActionGroup
*/
public class NonEmptyActionGroup extends DefaultActionGroup implements DumbAware {
public NonEmptyActionGroup() {
super();
platform/platform-impl/src/com/intellij/ide/actions/NonTrivialActionGroup.java
+39
View File
@@ -0,0 +1,39 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.ide.actions;
import com.intellij.openapi.actionSystem.ActionGroupUtil;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.DefaultActionGroup;
import com.intellij.openapi.project.DumbAware;
/**
* This group hides itself when there's no enabled and visible child.
*
* @see com.intellij.ide.actions.SmartPopupActionGroup
* @see com.intellij.ide.actions.NonEmptyActionGroup
*
* @author gregsh
*/
public class NonTrivialActionGroup extends DefaultActionGroup implements DumbAware {
public NonTrivialActionGroup() {
super();
}
public void update(AnActionEvent e) {
e.getPresentation().setVisible(!ActionGroupUtil.isGroupEmpty(this, e));
}
}
platform/platform-impl/src/com/intellij/ide/actions/SmartPopupActionGroup.java
+4
View File
@@ -20,6 +20,10 @@ import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.DefaultActionGroup;
/**
* This group turns itself into a popup if there's more than one child.
*
* @see com.intellij.ide.actions.NonEmptyActionGroup
* @see com.intellij.ide.actions.NonTrivialActionGroup
* @author yole
*/
public class SmartPopupActionGroup extends DefaultActionGroup {
platform/platform-impl/src/com/intellij/ide/actions/ToggleReadOnlyAttributeAction.java
+21 -18
View File
@@ -20,35 +20,39 @@
package com.intellij.ide.actions;
import com.intellij.CommonBundle;
import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.CommonDataKeys;
import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.fileEditor.FileDocumentManager;
import com.intellij.openapi.project.DumbAware;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.Messages;
import com.intellij.openapi.vfs.VfsUtil;
import com.intellij.openapi.vfs.VfsUtilCore;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.io.ReadOnlyAttributeUtil;
import java.io.IOException;
import java.util.ArrayList;
public class ToggleReadOnlyAttributeAction extends AnAction implements DumbAware {
static VirtualFile[] getFiles(DataContext dataContext){
ArrayList<VirtualFile> filesList = new ArrayList<VirtualFile>();
static VirtualFile[] getFiles(DataContext dataContext) {
ArrayList<VirtualFile> filesList = ContainerUtil.newArrayList();
VirtualFile[] files = CommonDataKeys.VIRTUAL_FILE_ARRAY.getData(dataContext);
for(int i=0;files!=null&&i<files.length;i++){
VirtualFile file=files[i];
if(file.isInLocalFileSystem()){
for (int i = 0; files != null && i < files.length; i++) {
VirtualFile file = files[i];
if (file.isInLocalFileSystem()) {
filesList.add(file);
}
}
return VfsUtil.toVirtualFileArray(filesList);
return VfsUtilCore.toVirtualFileArray(filesList);
}
public void update(AnActionEvent e){
VirtualFile[] files=getFiles(e.getDataContext());
e.getPresentation().setEnabled(files.length>0);
public void update(AnActionEvent e) {
VirtualFile[] files = getFiles(e.getDataContext());
e.getPresentation().setEnabledAndVisible(files.length > 0);
if (files.length > 0) {
boolean allReadOnly = true;
boolean allWritable = true;
@@ -70,28 +74,27 @@ public class ToggleReadOnlyAttributeAction extends AnAction implements DumbAware
e.getPresentation().setText("Toggle Read-only Attribute");
}
}
}
public void actionPerformed(final AnActionEvent e){
public void actionPerformed(final AnActionEvent e) {
ApplicationManager.getApplication().runWriteAction(
new Runnable(){
public void run(){
new Runnable() {
public void run() {
// Save all documents. We won't be able to save changes to the files that became read-only afterwards.
FileDocumentManager.getInstance().saveAllDocuments();
try {
VirtualFile[] files=getFiles(e.getDataContext());
VirtualFile[] files = getFiles(e.getDataContext());
for (VirtualFile file : files) {
ReadOnlyAttributeUtil.setReadOnlyAttribute(file, file.isWritable());
}
}
catch(IOException exc){
catch (IOException exc) {
Project project = CommonDataKeys.PROJECT.getData(e.getDataContext());
Messages.showMessageDialog(
project,
exc.getMessage(),
CommonBundle.getErrorTitle(),Messages.getErrorIcon()
CommonBundle.getErrorTitle(), Messages.getErrorIcon()
);
}
}
platform/platform-impl/src/com/intellij/openapi/vfs/encoding/ChangeFileEncodingAction.java
+1
View File
@@ -69,6 +69,7 @@ public class ChangeFileEncodingAction extends AnAction implements DumbAware {
VirtualFile myFile = e.getData(CommonDataKeys.VIRTUAL_FILE);
boolean enabled = myFile != null && checkEnabled(myFile);
e.getPresentation().setEnabled(enabled);
e.getPresentation().setVisible(myFile != null);
}
@Override
platform/platform-resources/src/idea/PlatformActions.xml
+1 -1
View File
@@ -189,7 +189,7 @@
<action id="ChangeFileEncodingAction" class="com.intellij.openapi.vfs.encoding.ChangeFileEncodingAction"/>
<group id="ChangeLineSeparators" text="Line Separators" popup="true">
<group id="ChangeLineSeparators" text="Line Separators" popup="true" class="com.intellij.ide.actions.NonTrivialActionGroup">
<action id="ConvertToWindowsLineSeparators" class="com.intellij.codeStyle.ConvertToWindowsLineSeparatorsAction"/>
<action id="ConvertToUnixLineSeparators" class="com.intellij.codeStyle.ConvertToUnixLineSeparatorsAction"/>
<action id="ConvertToMacLineSeparators" class="com.intellij.codeStyle.ConvertToMacLineSeparatorsAction"/>