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

rename properties files when bundle exist; rename property key from resource bundle editor (IDEA-11842 )

Browse Source
This commit is contained in:
anna
2011-12-06 20:41:50 +01:00
parent 9577185058
commit 33e1074c63
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/properties/src/META-INF/plugin.xml
+1
View File
@@ -30,6 +30,7 @@
<lang.parserDefinition language="Properties" implementationClass="com.intellij.lang.properties.parsing.PropertiesParserDefinition"/>
<renameHandler implementation="com.intellij.lang.properties.ResourceBundleRenameHandler"/>
<renameHandler implementation="com.intellij.lang.properties.ResourceBundleKeyRenameHandler"/>
<renameHandler implementation="com.intellij.lang.properties.PropertyRenameHandler"/>
<stubElementTypeHolder class="com.intellij.lang.properties.parsing.PropertiesElementTypes"/>
<renamePsiElementProcessor implementation="com.intellij.refactoring.rename.RenamePropertyProcessor"/>
plugins/properties/src/com/intellij/lang/properties/ResourceBundleRenameHandler.java
+4 -1
View File
@@ -20,6 +20,7 @@
package com.intellij.lang.properties;
import com.intellij.codeInsight.CodeInsightUtilBase;
import com.intellij.lang.properties.editor.ResourceBundleAsVirtualFile;
import com.intellij.lang.properties.editor.ResourceBundleEditor;
import com.intellij.lang.properties.psi.PropertiesFile;
import com.intellij.openapi.actionSystem.DataContext;
@@ -53,9 +54,11 @@ public class ResourceBundleRenameHandler implements RenameHandler {
return false;
}
final VirtualFile virtualFile = PlatformDataKeys.VIRTUAL_FILE.getData(dataContext);
ResourceBundleEditor editor = ResourceBundleUtil.getEditor(dataContext);
return (editor == null || editor.getState(FileEditorStateLevel.NAVIGATION).getPropertyName() == null /* user selected non-bundle key element */)
&& bundle.getPropertiesFiles(project).size() > 1;
&& bundle.getPropertiesFiles(project).size() > 1 && (virtualFile instanceof ResourceBundleAsVirtualFile || virtualFile == null);
}
public boolean isRenaming(DataContext dataContext) {
plugins/properties/src/com/intellij/lang/properties/ResourceBundleUtil.java
+2
View File
@@ -54,6 +54,8 @@ public class ResourceBundleUtil {
public static ResourceBundle getResourceBundleFromDataContext(@NotNull DataContext dataContext) {
PsiElement element = LangDataKeys.PSI_ELEMENT.getData(dataContext);
if (element instanceof IProperty) return null; //rename property
final ResourceBundle[] bundles = ResourceBundle.ARRAY_DATA_KEY.getData(dataContext);
if (bundles != null && bundles.length == 1) return bundles[0];
VirtualFile virtualFile = PlatformDataKeys.VIRTUAL_FILE.getData(dataContext);
if (virtualFile == null) {
return null;