From cf11aaabd15d8e8d3b9f14ecbf0570713bd2d9b4 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Wed, 5 Nov 2014 20:30:39 +0100 Subject: [PATCH] =?UTF-8?q?AppletConfiguration=20=E2=80=94=20don't=20save?= =?UTF-8?q?=20defaults=20(initial,=20not=20all=20default=20values=20are=20?= =?UTF-8?q?skipped)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/GenericDebuggerRunnerSettings.java | 18 ++++- .../execution/applet/AppletConfiguration.java | 31 ++++++--- .../LocatableConfigurationBase.java | 2 + .../configurations/RunConfigurationBase.java | 24 +++++-- .../configurations/RunnerSettingsEx.java | 35 ---------- .../xmlb/SkipEmptySerializationFilter.java | 1 + .../intellij/util/xmlb/SmartSerializer.java | 65 +++++++++++++++++++ 7 files changed, 125 insertions(+), 51 deletions(-) delete mode 100644 platform/lang-api/src/com/intellij/execution/configurations/RunnerSettingsEx.java create mode 100644 platform/util/src/com/intellij/util/xmlb/SmartSerializer.java diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/GenericDebuggerRunnerSettings.java b/java/debugger/impl/src/com/intellij/debugger/impl/GenericDebuggerRunnerSettings.java index ed6f45263b66..24601362d83b 100644 --- a/java/debugger/impl/src/com/intellij/debugger/impl/GenericDebuggerRunnerSettings.java +++ b/java/debugger/impl/src/com/intellij/debugger/impl/GenericDebuggerRunnerSettings.java @@ -17,11 +17,15 @@ package com.intellij.debugger.impl; import com.intellij.debugger.settings.DebuggerSettings; import com.intellij.execution.configurations.DebuggingRunnerData; -import com.intellij.execution.configurations.RunnerSettingsEx; +import com.intellij.execution.configurations.RunnerSettings; +import com.intellij.util.xmlb.SmartSerializer; import com.intellij.util.xmlb.annotations.OptionTag; import com.intellij.util.xmlb.annotations.Transient; +import org.jdom.Element; + +public class GenericDebuggerRunnerSettings implements DebuggingRunnerData, RunnerSettings { + private final SmartSerializer mySerializer = new SmartSerializer(); -public class GenericDebuggerRunnerSettings extends RunnerSettingsEx implements DebuggingRunnerData { @Transient @Deprecated public String DEBUG_PORT = ""; @@ -60,4 +64,14 @@ public class GenericDebuggerRunnerSettings extends RunnerSettingsEx implements D public void setTransport(int transport) { TRANSPORT = transport; } + + @Override + public void readExternal(Element element) { + mySerializer.readExternal(this, element); + } + + @Override + public void writeExternal(Element element) { + mySerializer.writeExternal(this, element); + } } diff --git a/java/execution/impl/src/com/intellij/execution/applet/AppletConfiguration.java b/java/execution/impl/src/com/intellij/execution/applet/AppletConfiguration.java index 0669cca5203e..9d00cad60172 100644 --- a/java/execution/impl/src/com/intellij/execution/applet/AppletConfiguration.java +++ b/java/execution/impl/src/com/intellij/execution/applet/AppletConfiguration.java @@ -28,7 +28,6 @@ import com.intellij.openapi.options.SettingsEditor; import com.intellij.openapi.project.Project; import com.intellij.openapi.projectRoots.JavaSdk; import com.intellij.openapi.util.Comparing; -import com.intellij.openapi.util.DefaultJDOMExternalizer; import com.intellij.openapi.util.InvalidDataException; import com.intellij.openapi.util.WriteExternalException; import com.intellij.openapi.util.io.FileUtil; @@ -36,6 +35,8 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiElement; import com.intellij.refactoring.listeners.RefactoringElementListener; +import com.intellij.util.xmlb.SmartSerializer; +import com.intellij.util.xmlb.annotations.Transient; import org.jdom.Element; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -60,6 +61,7 @@ public class AppletConfiguration extends ModuleBasedConfiguration parameters = new ArrayList(); for (final Element element : parentNode.getChildren(PARAMETER_ELEMENT_NAME)) { @@ -194,10 +201,15 @@ public class AppletConfiguration extends ModuleBasedConfiguration mySerializedAccessorNameTracker = new THashSet(); - private final SkipDefaultValuesSerializationFilters mySerializationFilter = new SkipDefaultValuesSerializationFilters() { - @Override - protected boolean accepts(@NotNull Accessor accessor, @NotNull Object bean, @Nullable Object beanValue) { - if (mySerializedAccessorNameTracker.contains(accessor.getName())) { - return true; - } - return super.accepts(accessor, bean, beanValue); - } - }; - - @Override - public final void readExternal(Element element) { - mySerializedAccessorNameTracker.clear(); - XmlSerializer.deserializeInto(this, element, mySerializedAccessorNameTracker); - } - - @Override - public final void writeExternal(Element element) { - XmlSerializer.serializeInto(this, element, mySerializationFilter); - } -} \ No newline at end of file diff --git a/platform/util/src/com/intellij/util/xmlb/SkipEmptySerializationFilter.java b/platform/util/src/com/intellij/util/xmlb/SkipEmptySerializationFilter.java index 3ab8601d3e0b..4a98cf7a5cb8 100644 --- a/platform/util/src/com/intellij/util/xmlb/SkipEmptySerializationFilter.java +++ b/platform/util/src/com/intellij/util/xmlb/SkipEmptySerializationFilter.java @@ -35,6 +35,7 @@ public class SkipEmptySerializationFilter extends SerializationFilterBase { } if (Boolean.FALSE.equals(beanValue) || + (beanValue instanceof String && ((String)beanValue).isEmpty()) || (beanValue instanceof Map && ((Map)beanValue).isEmpty()) || (beanValue instanceof Collection && ((Collection)beanValue).isEmpty())) { return false; diff --git a/platform/util/src/com/intellij/util/xmlb/SmartSerializer.java b/platform/util/src/com/intellij/util/xmlb/SmartSerializer.java new file mode 100644 index 000000000000..dd6a7cb916d3 --- /dev/null +++ b/platform/util/src/com/intellij/util/xmlb/SmartSerializer.java @@ -0,0 +1,65 @@ +/* + * 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.util.xmlb; + +import com.intellij.util.ThreeState; +import gnu.trove.THashSet; +import org.jdom.Element; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.util.Set; + +public final class SmartSerializer { + private final Set mySerializedAccessorNameTracker; + private final SerializationFilter mySerializationFilter; + + public SmartSerializer(boolean trackSerializedNames, boolean useSkipEmptySerializationFilter) { + mySerializedAccessorNameTracker = trackSerializedNames ? new THashSet() : null; + + mySerializationFilter = useSkipEmptySerializationFilter ? + new SkipEmptySerializationFilter() { + @Override + protected ThreeState accepts(@NotNull String name, @NotNull Object beanValue) { + return mySerializedAccessorNameTracker != null && mySerializedAccessorNameTracker.contains(name) ? ThreeState.YES : ThreeState.UNSURE; + } + } : + new SkipDefaultValuesSerializationFilters() { + @Override + protected boolean accepts(@NotNull Accessor accessor, @NotNull Object bean, @Nullable Object beanValue) { + if (mySerializedAccessorNameTracker != null && mySerializedAccessorNameTracker.contains(accessor.getName())) { + return true; + } + return super.accepts(accessor, bean, beanValue); + } + }; + } + + public SmartSerializer() { + this(true, false); + } + + public void readExternal(@NotNull Object bean, @NotNull Element element) { + if (mySerializedAccessorNameTracker != null) { + mySerializedAccessorNameTracker.clear(); + } + XmlSerializer.deserializeInto(bean, element, mySerializedAccessorNameTracker); + } + + public void writeExternal(@NotNull Object bean, @NotNull Element element) { + XmlSerializer.serializeInto(bean, element, mySerializationFilter); + } +} \ No newline at end of file