diff options
Diffstat (limited to 'plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/editor')
4 files changed, 3 insertions, 256 deletions
diff --git a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/editor/ResourceBundleAsVirtualFile.java b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/editor/ResourceBundleAsVirtualFile.java deleted file mode 100644 index 36915e7e6962..000000000000 --- a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/editor/ResourceBundleAsVirtualFile.java +++ /dev/null @@ -1,183 +0,0 @@ -/* - * 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. - */ - -/** - * @author Alexey - */ -package com.intellij.lang.properties.editor; - -import com.intellij.ide.presentation.Presentation; -import com.intellij.lang.properties.PropertiesImplUtil; -import com.intellij.lang.properties.PropertiesUtil; -import com.intellij.lang.properties.ResourceBundle; -import com.intellij.lang.properties.psi.PropertiesFile; -import com.intellij.openapi.project.Project; -import com.intellij.openapi.vfs.LocalFileSystem; -import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.openapi.vfs.VirtualFileSystem; -import com.intellij.psi.PsiManager; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; - -@Presentation(icon = "AllIcons.Nodes.ResourceBundle") -public class ResourceBundleAsVirtualFile extends VirtualFile { - private final VirtualFile myBasePropertiesFile; - - private ResourceBundleAsVirtualFile(@NotNull final VirtualFile basePropertiesFile) { - myBasePropertiesFile = basePropertiesFile; - } - - @NotNull - public static ResourceBundleAsVirtualFile fromResourceBundle(final @NotNull ResourceBundle resourceBundle) { - return new ResourceBundleAsVirtualFile(resourceBundle.getDefaultPropertiesFile().getVirtualFile()); - } - - @Nullable - public ResourceBundle getResourceBundle(final Project project) { - final PsiManager psiManager = PsiManager.getInstance(project); - final PropertiesFile file = PropertiesImplUtil.getPropertiesFile(psiManager.findFile(myBasePropertiesFile)); - if (file == null) { - return null; - } - return PropertiesImplUtil.getResourceBundle(file); - } - - @Override - @NotNull - public VirtualFileSystem getFileSystem() { - return LocalFileSystem.getInstance(); - } - - @Override - @NotNull - public String getPath() { - return getName(); - } - - @Override - @NotNull - public String getName() { - return PropertiesUtil.getBaseName(myBasePropertiesFile); - } - - public boolean equals(final Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - - final ResourceBundleAsVirtualFile resourceBundleAsVirtualFile = (ResourceBundleAsVirtualFile)o; - - if (!myBasePropertiesFile.equals(resourceBundleAsVirtualFile.myBasePropertiesFile)) return false; - - return true; - } - - public int hashCode() { - return myBasePropertiesFile.hashCode(); - } - - @Override - public void rename(Object requestor, @NotNull String newName) throws IOException { - throw new UnsupportedOperationException(); - } - - @Override - public boolean isWritable() { - return true; - } - - @Override - public boolean isDirectory() { - return false; - } - - @Override - public boolean isValid() { - return true; - } - - @Override - public VirtualFile getParent() { - return myBasePropertiesFile.getParent(); - } - - @Override - public VirtualFile[] getChildren() { - return EMPTY_ARRAY; - } - - @NotNull - @Override - public VirtualFile createChildDirectory(Object requestor, @NotNull String name) throws IOException { - throw new UnsupportedOperationException(); - } - - @NotNull - @Override - public VirtualFile createChildData(Object requestor, @NotNull String name) throws IOException { - throw new UnsupportedOperationException(); - } - - @Override - public void delete(Object requestor) throws IOException { - //todo - } - - @Override - public void move(Object requestor, @NotNull VirtualFile newParent) throws IOException { - //todo - } - - @Override - public InputStream getInputStream() throws IOException { - throw new UnsupportedOperationException(); - } - - @Override - @NotNull - public OutputStream getOutputStream(Object requestor, long newModificationStamp, long newTimeStamp) throws IOException { - throw new UnsupportedOperationException(); - } - - @Override - @NotNull - public byte[] contentsToByteArray() throws IOException { - throw new UnsupportedOperationException(); - } - - @Override - public long getModificationStamp() { - return 0; - } - - @Override - public long getTimeStamp() { - return 0; - } - - @Override - public long getLength() { - return 0; - } - - @Override - public void refresh(boolean asynchronous, boolean recursive, Runnable postRunnable) { - - } -} diff --git a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/editor/ResourceBundleEditorViewElement.java b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/editor/ResourceBundleEditorViewElement.java index 58932d1fd4c5..8a8d3b0390d4 100644 --- a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/editor/ResourceBundleEditorViewElement.java +++ b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/editor/ResourceBundleEditorViewElement.java @@ -16,9 +16,7 @@ package com.intellij.lang.properties.editor; -import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; -import org.jetbrains.annotations.NotNull; /** * @author Dmitry Batkovich diff --git a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/editor/ResourceBundlePropertyStructureViewElement.java b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/editor/ResourceBundlePropertyStructureViewElement.java index ed660536d052..724a794ca3bb 100644 --- a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/editor/ResourceBundlePropertyStructureViewElement.java +++ b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/editor/ResourceBundlePropertyStructureViewElement.java @@ -24,6 +24,7 @@ import com.intellij.lang.properties.IProperty; import com.intellij.lang.properties.PropertiesHighlighter; import com.intellij.lang.properties.PropertiesUtil; import com.intellij.lang.properties.ResourceBundle; +import com.intellij.lang.properties.psi.Property; import com.intellij.navigation.ColoredItemPresentation; import com.intellij.navigation.ItemPresentation; import com.intellij.openapi.editor.colors.EditorColorsManager; @@ -69,8 +70,8 @@ public class ResourceBundlePropertyStructureViewElement implements StructureView } @Override - public String getValue() { - return myProperty.getName(); + public Property getValue() { + return (Property)myProperty.getPsiElement(); } @Override diff --git a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/editor/ResourceBundleUtil.java b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/editor/ResourceBundleUtil.java deleted file mode 100644 index e4a35e7e677c..000000000000 --- a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/editor/ResourceBundleUtil.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * 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.lang.properties.editor; - -import com.intellij.lang.properties.IProperty; -import com.intellij.lang.properties.ResourceBundle; -import com.intellij.lang.properties.psi.PropertiesFile; -import com.intellij.openapi.actionSystem.CommonDataKeys; -import com.intellij.openapi.actionSystem.DataContext; -import com.intellij.openapi.project.Project; -import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.psi.PsiElement; -import com.intellij.psi.PsiFile; -import com.intellij.psi.PsiManager; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -/** - * @author Denis Zhdanov - * @since 10/5/11 2:35 PM - */ -public class ResourceBundleUtil { - - private ResourceBundleUtil() { - } - - /** - * Tries to derive {@link com.intellij.lang.properties.ResourceBundle resource bundle} related to the given context. - * - * @param dataContext target context - * @return {@link com.intellij.lang.properties.ResourceBundle resource bundle} related to the given context if any; - * <code>null</code> otherwise - */ - @Nullable - public static ResourceBundle getResourceBundleFromDataContext(@NotNull DataContext dataContext) { - PsiElement element = CommonDataKeys.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 = CommonDataKeys.VIRTUAL_FILE.getData(dataContext); - if (virtualFile == null) { - return null; - } - final Project project = CommonDataKeys.PROJECT.getData(dataContext); - if (virtualFile instanceof ResourceBundleAsVirtualFile && project != null) { - return ((ResourceBundleAsVirtualFile)virtualFile).getResourceBundle(project); - } - if (project != null) { - final PsiFile psiFile = PsiManager.getInstance(project).findFile(virtualFile); - if (psiFile instanceof PropertiesFile) { - return ((PropertiesFile)psiFile).getResourceBundle(); - } - } - return null; - } -} |