From d7448a936229fd5851c71df52df6eb2074feaa11 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Wed, 29 May 2013 12:15:16 +0200 Subject: [PATCH 1/2] continue WEB-4454 JavaScript debug: local and remote run configurations are confusing --- platform/util/src/com/intellij/util/io/URLUtil.java | 1 + 1 file changed, 1 insertion(+) diff --git a/platform/util/src/com/intellij/util/io/URLUtil.java b/platform/util/src/com/intellij/util/io/URLUtil.java index dc291bf543d9..a55c15279195 100644 --- a/platform/util/src/com/intellij/util/io/URLUtil.java +++ b/platform/util/src/com/intellij/util/io/URLUtil.java @@ -94,6 +94,7 @@ public class URLUtil { final ZipEntry zipEntry = zipFile.getEntry(resource); if (zipEntry == null) throw new FileNotFoundException("Entry " + resource + " not found in " + file); return new FilterInputStream(zipFile.getInputStream(zipEntry)) { + @Override public void close() throws IOException { super.close(); zipFile.close(); From d5f430925df8d99f19acd90b73543cfe32f04e5b Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Wed, 29 May 2013 15:14:41 +0200 Subject: [PATCH 2/2] continue WEB-4454 JavaScript debug: local and remote run configurations are confusing --- .../util/src/com/intellij/util/xmlb/AttributeBinding.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/platform/util/src/com/intellij/util/xmlb/AttributeBinding.java b/platform/util/src/com/intellij/util/xmlb/AttributeBinding.java index 1833947df827..49b70e638ac6 100644 --- a/platform/util/src/com/intellij/util/xmlb/AttributeBinding.java +++ b/platform/util/src/com/intellij/util/xmlb/AttributeBinding.java @@ -32,6 +32,7 @@ public class AttributeBinding implements Binding { myAttribute = attribute; } + @Override public Object serialize(Object o, Object context, SerializationFilter filter) { final Object v = myAccessor.read(o); final Object node = myBinding.serialize(v, context, filter); @@ -39,6 +40,7 @@ public class AttributeBinding implements Binding { return new org.jdom.Attribute(myAttribute.value(), ((Content)node).getValue()); } + @Override @Nullable public Object deserialize(Object context, @NotNull Object... nodes) { assert nodes.length == 1; @@ -52,14 +54,17 @@ public class AttributeBinding implements Binding { return context; } + @Override public boolean isBoundTo(Object node) { return node instanceof org.jdom.Attribute && ((org.jdom.Attribute)node).getName().equals(myAttribute.value()); } + @Override public Class getBoundNodeType() { return org.jdom.Attribute.class; } + @Override public void init() { myBinding = XmlSerializerImpl.getBinding(myAccessor); if (!Text.class.isAssignableFrom(myBinding.getBoundNodeType())) {