From 2987fdb884d318e7cb01d08afffc889e9bef11e2 Mon Sep 17 00:00:00 2001 From: Eugene Kudelevsky Date: Fri, 3 Aug 2012 16:00:33 +0400 Subject: [PATCH] remove logging --- .../converters/AndroidResourceReference.java | 32 ------------------- .../LazyValueResourceElementWrapper.java | 2 -- .../wrappers/ValueResourceElementWrapper.java | 3 -- 3 files changed, 37 deletions(-) diff --git a/plugins/android/src/org/jetbrains/android/dom/converters/AndroidResourceReference.java b/plugins/android/src/org/jetbrains/android/dom/converters/AndroidResourceReference.java index 60b6177bd1ff..67e772a2e0a1 100644 --- a/plugins/android/src/org/jetbrains/android/dom/converters/AndroidResourceReference.java +++ b/plugins/android/src/org/jetbrains/android/dom/converters/AndroidResourceReference.java @@ -81,14 +81,12 @@ public class AndroidResourceReference extends PsiReferenceBase.Poly @Override public PsiElement handleElementRename(String newElementName) throws IncorrectOperationException { - System.out.println("Handle element rename to " + newElementName); if (newElementName.startsWith(AndroidResourceUtil.NEW_ID_PREFIX)) { newElementName = AndroidResourceUtil.getResourceNameByReferenceText(newElementName); } ResourceValue value = myValue.getValue(); assert value != null; String resType = value.getResourceType(); - System.out.println("Restype: " + resType); if (resType != null && newElementName != null) { // todo: do not allow new value resource name to contain dot, because it is impossible to check if it file or value otherwise @@ -96,7 +94,6 @@ public class AndroidResourceReference extends PsiReferenceBase.Poly final String newResName = newElementName.contains(".") // it is file ? AndroidCommonUtils.getResourceName(resType, newElementName) : newElementName; - System.out.println("New res name: " + newResName); myValue.setValue(ResourceValue.referenceTo(value.getPrefix(), value.getPackage(), resType, newResName)); } return myValue.getXmlTag(); @@ -202,51 +199,22 @@ public class AndroidResourceReference extends PsiReferenceBase.Poly final PsiFile psiFile = element.getContainingFile(); final VirtualFile vFile = psiFile != null ? psiFile.getVirtualFile() : null; - boolean log = element instanceof XmlAttributeValue || element instanceof LazyValueResourceElementWrapper; - for (ResolveResult result : results) { final PsiElement target = result.getElement(); - if (log) { - System.out.println("resolved to " + target); - } - if (element.getManager().areElementsEquivalent(target, element)) { - if (log) { - System.out.println("equivalent"); - } return true; } - else if (log) { - System.out.println("non-equivalent"); - } if (target instanceof LazyValueResourceElementWrapper && vFile != null) { final ValueResourceInfo info = ((LazyValueResourceElementWrapper)target).getResourceInfo(); - if (log) { - System.out.println("lazy computed to " + info); - System.out.println(vFile + "; class: " + vFile.getClass().getCanonicalName()); - System.out.println(info.getContainingFile() + "; class: " + info.getContainingFile().getClass().getCanonicalName()); - System.out.println(vFile.equals(info.getContainingFile())); - } - if (info.getContainingFile().equals(vFile)) { final XmlAttributeValue realTarget = info.computeXmlElement(); - if (log) { - System.out.println("computed element " + element + "; text: " + element.getText()); - } - if (element.getManager().areElementsEquivalent(realTarget, element)) { - if (log) { - System.out.println("equivalent"); - } return true; } - else if (log) { - System.out.println("non-equivalent"); - } } } } diff --git a/plugins/android/src/org/jetbrains/android/dom/wrappers/LazyValueResourceElementWrapper.java b/plugins/android/src/org/jetbrains/android/dom/wrappers/LazyValueResourceElementWrapper.java index 55b23ef41fcb..5ac56ab7e1a9 100644 --- a/plugins/android/src/org/jetbrains/android/dom/wrappers/LazyValueResourceElementWrapper.java +++ b/plugins/android/src/org/jetbrains/android/dom/wrappers/LazyValueResourceElementWrapper.java @@ -40,7 +40,6 @@ public class LazyValueResourceElementWrapper extends RenameableFakePsiElement im throw new IncorrectOperationException( "Cannot find resource '" + myResourceInfo.getName() + "' in file " + myResourceInfo.getContainingFile().getPath()); } - System.out.println("Lazy;set name: " + name); return new ValueResourceElementWrapper(element).setName(name); } @@ -98,7 +97,6 @@ public class LazyValueResourceElementWrapper extends RenameableFakePsiElement im public static PsiElement computeLazyElement(PsiElement element) { if (element instanceof LazyValueResourceElementWrapper) { element = ((LazyValueResourceElementWrapper)element).computeElement(); - System.out.println("computed element" + element); } return element; } diff --git a/plugins/android/src/org/jetbrains/android/dom/wrappers/ValueResourceElementWrapper.java b/plugins/android/src/org/jetbrains/android/dom/wrappers/ValueResourceElementWrapper.java index 819862211dda..369919cf1eda 100644 --- a/plugins/android/src/org/jetbrains/android/dom/wrappers/ValueResourceElementWrapper.java +++ b/plugins/android/src/org/jetbrains/android/dom/wrappers/ValueResourceElementWrapper.java @@ -340,7 +340,6 @@ public class ValueResourceElementWrapper implements XmlAttributeValue, ResourceE @Nullable public PsiElement setName(@NonNls @NotNull String name) throws IncorrectOperationException { - System.out.println("Wrapper;set name: " + name); if (AndroidResourceUtil.isIdDeclaration(myWrappee)) { XmlAttribute attribute = (XmlAttribute)myWrappee.getParent(); attribute.setValue(name); @@ -351,9 +350,7 @@ public class ValueResourceElementWrapper implements XmlAttributeValue, ResourceE DomElement domElement = DomManager.getDomManager(getProject()).getDomElement(tag); assert domElement instanceof ResourceElement; ResourceElement resElement = (ResourceElement)domElement; - System.out.println("resElement: " + resElement + ", name to set: " + name); resElement.getName().setValue(name); - System.out.println("setted: " + resElement.getName().getStringValue()); } return null; }