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

cleanup

Browse Source
This commit is contained in:
peter
2012-07-09 17:28:04 +02:00
parent 33ff827906
commit a2bc5553b5
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/properties/src/com/intellij/lang/properties/references/PropertyReferenceBase.java
+4 -9
View File
@@ -28,9 +28,9 @@ import com.intellij.openapi.editor.markup.TextAttributes;
import com.intellij.openapi.roots.ProjectRootManager;
import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.util.TextRange;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.pom.references.PomService;
import com.intellij.psi.*;
import com.intellij.util.Function;
import com.intellij.util.IncorrectOperationException;
import com.intellij.util.NullableFunction;
import com.intellij.util.PlatformIcons;
@@ -50,18 +50,13 @@ import java.util.Set;
*/
public abstract class PropertyReferenceBase implements PsiPolyVariantReference, EmptyResolveMessageProvider {
private static final Logger LOG = Logger.getInstance("#com.intellij.lang.properties.references.PropertyReferenceBase");
private static final Function<IProperty,PsiElement> MAPPER = new Function<IProperty, PsiElement>() {
@Override
public PsiElement fun(IProperty iProperty) {
return iProperty.getPsiElement();
}
};
private static final LookupElementRenderer<LookupElement> LOOKUP_ELEMENT_RENDERER = new LookupElementRenderer<LookupElement>() {
@Override
public void renderElement(LookupElement element, LookupElementPresentation presentation) {
IProperty property = (IProperty)element.getObject();
presentation.setIcon(PlatformIcons.PROPERTY_ICON);
presentation.setItemText(property.getUnescapedKey());
String key = StringUtil.notNullize(property.getUnescapedKey());
presentation.setItemText(key);
PropertiesFile propertiesFile = property.getPropertiesFile();
ResourceBundle resourceBundle = propertiesFile.getResourceBundle();
@@ -69,7 +64,7 @@ public abstract class PropertyReferenceBase implements PsiPolyVariantReference,
boolean hasBundle = resourceBundle != ResourceBundleImpl.NULL;
if (hasBundle) {
PropertiesFile defaultPropertiesFile = resourceBundle.getDefaultPropertiesFile(propertiesFile.getProject());
IProperty defaultProperty = defaultPropertiesFile.findPropertyByKey(property.getUnescapedKey());
IProperty defaultProperty = defaultPropertiesFile.findPropertyByKey(key);
if (defaultProperty != null) {
value = defaultProperty.getValue();
}