diff --git a/jps/jps-builders/src/org/jetbrains/jps/packaging/jlink/JpsJLinkProperties.java b/jps/jps-builders/src/org/jetbrains/jps/packaging/jlink/JpsJLinkProperties.java index df366f3fe2e6..c51cedd7343d 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/packaging/jlink/JpsJLinkProperties.java +++ b/jps/jps-builders/src/org/jetbrains/jps/packaging/jlink/JpsJLinkProperties.java @@ -30,11 +30,6 @@ final class JpsJLinkProperties extends JpsElementBase { return new JpsJLinkProperties(this); } - @Override - public void applyChanges(@NotNull JpsJLinkProperties modified) { - copyToThis(modified); - } - private void copyToThis(@NotNull JpsJLinkProperties copy) { compressionLevel = copy.compressionLevel; verbose = copy.verbose; diff --git a/jps/model-api/src/org/jetbrains/jps/model/ex/JpsCompositeElementBase.java b/jps/model-api/src/org/jetbrains/jps/model/ex/JpsCompositeElementBase.java index 0abc2c9d47c7..9ac6c601fc96 100644 --- a/jps/model-api/src/org/jetbrains/jps/model/ex/JpsCompositeElementBase.java +++ b/jps/model-api/src/org/jetbrains/jps/model/ex/JpsCompositeElementBase.java @@ -30,11 +30,6 @@ public abstract class JpsCompositeElementBase, JpsElement> getElementsMap(); - - protected abstract void applyChanges(JpsElementContainerEx modified); } diff --git a/jps/model-api/src/org/jetbrains/jps/model/ex/JpsNamedCompositeElementBase.java b/jps/model-api/src/org/jetbrains/jps/model/ex/JpsNamedCompositeElementBase.java index 3ec89a589a2b..75140540f1ce 100644 --- a/jps/model-api/src/org/jetbrains/jps/model/ex/JpsNamedCompositeElementBase.java +++ b/jps/model-api/src/org/jetbrains/jps/model/ex/JpsNamedCompositeElementBase.java @@ -39,12 +39,6 @@ public abstract class JpsNamedCompositeElementBase { private String myRelativeOutputPath = ""; private boolean myForGeneratedSources; @@ -45,10 +46,4 @@ public class JavaResourceRootProperties extends JpsElementBase extends JpsElementBase createCopy() { return new UnknownSourceRootTypeProperties<>(myPropertiesData); } - - @Override - public void applyChanges(@NotNull UnknownSourceRootTypeProperties modified) { - // not supported - } } diff --git a/jps/model-impl/src/com/intellij/platform/jps/model/impl/resolver/JpsDependencyResolverConfigurationImpl.java b/jps/model-impl/src/com/intellij/platform/jps/model/impl/resolver/JpsDependencyResolverConfigurationImpl.java index bb963e6c6f06..5d0232d5bedd 100644 --- a/jps/model-impl/src/com/intellij/platform/jps/model/impl/resolver/JpsDependencyResolverConfigurationImpl.java +++ b/jps/model-impl/src/com/intellij/platform/jps/model/impl/resolver/JpsDependencyResolverConfigurationImpl.java @@ -53,10 +53,4 @@ public class JpsDependencyResolverConfigurationImpl extends JpsElementBase implements JpsExtractedDirectoryPackagingElement { private String myPathInJar; @@ -20,12 +21,6 @@ public class JpsExtractedDirectoryPackagingElementImpl extends JpsFileCopyPackag return new JpsExtractedDirectoryPackagingElementImpl(myFilePath, myPathInJar); } - @Override - public void applyChanges(@NotNull JpsExtractedDirectoryPackagingElementImpl modified) { - super.applyChanges(modified); - setPathInJar(modified.myPathInJar); - } - @Override public String getPathInJar() { return myPathInJar; diff --git a/jps/model-impl/src/org/jetbrains/jps/model/artifact/impl/elements/JpsFileCopyPackagingElementBase.java b/jps/model-impl/src/org/jetbrains/jps/model/artifact/impl/elements/JpsFileCopyPackagingElementBase.java index 89295b3f0810..fc667b70fe2b 100644 --- a/jps/model-impl/src/org/jetbrains/jps/model/artifact/impl/elements/JpsFileCopyPackagingElementBase.java +++ b/jps/model-impl/src/org/jetbrains/jps/model/artifact/impl/elements/JpsFileCopyPackagingElementBase.java @@ -1,11 +1,11 @@ // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.jetbrains.jps.model.artifact.impl.elements; -import java.util.Objects; -import org.jetbrains.annotations.NotNull; import org.jetbrains.jps.model.artifact.elements.JpsPackagingElement; import org.jetbrains.jps.model.ex.JpsElementBase; +import java.util.Objects; + public abstract class JpsFileCopyPackagingElementBase> extends JpsElementBase implements JpsPackagingElement { protected String myFilePath; @@ -14,11 +14,6 @@ public abstract class JpsFileCopyPackagingElementBase implements JpsFileCopyPackagingElement { private String myRenamedOutputFileName; @@ -19,12 +20,6 @@ public class JpsFileCopyPackagingElementImpl extends JpsFileCopyPackagingElement return new JpsFileCopyPackagingElementImpl(myFilePath, myRenamedOutputFileName); } - @Override - public void applyChanges(@NotNull JpsFileCopyPackagingElementImpl modified) { - super.applyChanges(modified); - setRenamedOutputFileName(modified.myRenamedOutputFileName); - } - @Override public String getRenamedOutputFileName() { return myRenamedOutputFileName; diff --git a/jps/model-impl/src/org/jetbrains/jps/model/ex/JpsElementContainerImpl.java b/jps/model-impl/src/org/jetbrains/jps/model/ex/JpsElementContainerImpl.java index adc0506dbb29..46971d724dee 100644 --- a/jps/model-impl/src/org/jetbrains/jps/model/ex/JpsElementContainerImpl.java +++ b/jps/model-impl/src/org/jetbrains/jps/model/ex/JpsElementContainerImpl.java @@ -5,8 +5,6 @@ import com.intellij.util.containers.CollectionFactory; import org.jetbrains.annotations.NotNull; import org.jetbrains.jps.model.*; -import java.util.ArrayList; -import java.util.Collection; import java.util.Map; import java.util.function.Supplier; @@ -110,45 +108,4 @@ public class JpsElementContainerImpl extends JpsElementContainerEx implements Jp protected final Map, JpsElement> getElementsMap() { return myElements; } - - @Override - public void applyChanges(@NotNull JpsElementContainerEx modified) { - final Collection> roles = new ArrayList<>(); - - synchronized (myDataLock) { - roles.addAll(myElements.keySet()); - } - for (JpsElementChildRole role : roles) { - applyChanges(role, modified); - } - - roles.clear(); - synchronized (modified.getDataLock()) { - roles.addAll(modified.getElementsMap().keySet()); - } - synchronized (myDataLock) { - roles.removeAll(myElements.keySet()); - } - - for (JpsElementChildRole role : roles) { - applyChanges(role, modified); - } - } - - private void applyChanges(JpsElementChildRole role, JpsElementContainerEx modified) { - final T child = getChild(role); - final T modifiedChild = modified.getChild(role); - if (child != null && modifiedChild != null) { - final JpsElement.BulkModificationSupport modificationSupport = child.getBulkModificationSupport(); - //noinspection unchecked - modificationSupport.applyChanges(modifiedChild); - } - else if (modifiedChild == null) { - removeChild(role); - } - else { - //noinspection unchecked - setChild(role, (T)modifiedChild.getBulkModificationSupport().createCopy()); - } - } } diff --git a/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsDummyElementImpl.java b/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsDummyElementImpl.java index a27b9ca2a29d..982b8703bf19 100644 --- a/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsDummyElementImpl.java +++ b/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsDummyElementImpl.java @@ -25,8 +25,4 @@ public final class JpsDummyElementImpl extends JpsElementBase extends JpsEle return new JpsElementCollectionImpl<>(this); } - @Override - public void applyChanges(@NotNull JpsElementCollectionImpl modified) { - Set toRemove = new LinkedHashSet<>(myElements); - List toAdd = new ArrayList<>(); - final Map copyToOriginal = modified.myCopyToOriginal; - for (E element : modified.myElements) { - final E original = copyToOriginal != null ? copyToOriginal.get(element) : null; - if (original != null) { - //noinspection unchecked - ((BulkModificationSupport)original.getBulkModificationSupport()).applyChanges(element); - toRemove.remove(original); - } - else { - //noinspection unchecked - final E copy = (E)element.getBulkModificationSupport().createCopy(); - toAdd.add(copy); - } - } - for (E e : toRemove) { - removeChild(e); - } - for (E e : toAdd) { - addChild(e); - } - } - private final class JpsElementIterable, P extends JpsElement> implements Iterable { private final JpsElementType myType; diff --git a/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsEncodingProjectConfigurationImpl.java b/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsEncodingProjectConfigurationImpl.java index e8d31d23f558..2e4be4be0558 100644 --- a/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsEncodingProjectConfigurationImpl.java +++ b/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsEncodingProjectConfigurationImpl.java @@ -110,8 +110,4 @@ public final class JpsEncodingProjectConfigurationImpl extends JpsElementBase extends JpsElementBase createCopy() { return new JpsSimpleElementImpl<>(this); } - - @Override - public void applyChanges(@NotNull JpsSimpleElementImpl modified) { - setData(modified.getData()); - } } diff --git a/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsUrlListImpl.java b/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsUrlListImpl.java index 97d285628802..1eba9bc54993 100644 --- a/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsUrlListImpl.java +++ b/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsUrlListImpl.java @@ -55,13 +55,4 @@ public final class JpsUrlListImpl extends JpsElementBase impleme myUrls.remove(url); fireElementChanged(); } - - @Override - public void applyChanges(@NotNull JpsUrlListImpl modified) { - if (!myUrls.equals(modified.myUrls)) { - myUrls.clear(); - myUrls.addAll(modified.myUrls); - fireElementChanged(); - } - } } diff --git a/jps/model-impl/src/org/jetbrains/jps/model/jarRepository/impl/JpsRemoteRepositoriesConfigurationImpl.java b/jps/model-impl/src/org/jetbrains/jps/model/jarRepository/impl/JpsRemoteRepositoriesConfigurationImpl.java index 065cc9883d84..1ecd3972c451 100644 --- a/jps/model-impl/src/org/jetbrains/jps/model/jarRepository/impl/JpsRemoteRepositoriesConfigurationImpl.java +++ b/jps/model-impl/src/org/jetbrains/jps/model/jarRepository/impl/JpsRemoteRepositoriesConfigurationImpl.java @@ -37,11 +37,6 @@ public final class JpsRemoteRepositoriesConfigurationImpl extends JpsElementBase return new JpsRemoteRepositoriesConfigurationImpl(repositories); } - @Override - public void applyChanges(@NotNull JpsRemoteRepositoriesConfigurationImpl modified) { - setRepositories(modified.getRepositories()); - } - @Override public List getRepositories() { return Collections.unmodifiableList(repositories); diff --git a/jps/model-impl/src/org/jetbrains/jps/model/java/impl/ExplodedDirectoryModuleExtensionImpl.java b/jps/model-impl/src/org/jetbrains/jps/model/java/impl/ExplodedDirectoryModuleExtensionImpl.java index ccbca1c6aac7..ab307a690af2 100644 --- a/jps/model-impl/src/org/jetbrains/jps/model/java/impl/ExplodedDirectoryModuleExtensionImpl.java +++ b/jps/model-impl/src/org/jetbrains/jps/model/java/impl/ExplodedDirectoryModuleExtensionImpl.java @@ -1,13 +1,14 @@ // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.jetbrains.jps.model.java.impl; -import java.util.Objects; import org.jetbrains.annotations.NotNull; import org.jetbrains.jps.model.JpsElementCreator; import org.jetbrains.jps.model.ex.JpsElementBase; import org.jetbrains.jps.model.ex.JpsElementChildRoleBase; import org.jetbrains.jps.model.java.ExplodedDirectoryModuleExtension; +import java.util.Objects; + public class ExplodedDirectoryModuleExtensionImpl extends JpsElementBase implements ExplodedDirectoryModuleExtension { private String myExplodedUrl; @@ -53,12 +54,6 @@ public class ExplodedDirectoryModuleExtensionImpl extends JpsElementBase implements JpsElementCreator { public static final ExplodedDirectoryModuleExtensionRole INSTANCE = new ExplodedDirectoryModuleExtensionRole(); diff --git a/jps/model-impl/src/org/jetbrains/jps/model/java/impl/JavaModuleIndexImpl.java b/jps/model-impl/src/org/jetbrains/jps/model/java/impl/JavaModuleIndexImpl.java index ddadb4eeae14..53a32e564a14 100644 --- a/jps/model-impl/src/org/jetbrains/jps/model/java/impl/JavaModuleIndexImpl.java +++ b/jps/model-impl/src/org/jetbrains/jps/model/java/impl/JavaModuleIndexImpl.java @@ -37,11 +37,6 @@ public class JavaModuleIndexImpl extends JpsElementBase imp return copy; } - @Override - public void applyChanges(@NotNull JavaModuleIndexImpl modified) { - // not supported - } - @Nullable @Override public File getModuleInfoFile(@NotNull JpsModule module, boolean forTests) { diff --git a/jps/model-impl/src/org/jetbrains/jps/model/java/impl/JpsJavaDependencyExtensionImpl.java b/jps/model-impl/src/org/jetbrains/jps/model/java/impl/JpsJavaDependencyExtensionImpl.java index d8d9b9b0a417..df36c5473558 100644 --- a/jps/model-impl/src/org/jetbrains/jps/model/java/impl/JpsJavaDependencyExtensionImpl.java +++ b/jps/model-impl/src/org/jetbrains/jps/model/java/impl/JpsJavaDependencyExtensionImpl.java @@ -67,10 +67,4 @@ public class JpsJavaDependencyExtensionImpl extends JpsElementBase implements JpsJavaProjectExtension { private String myOutputUrl; private LanguageLevel myLanguageLevel; @@ -51,10 +52,4 @@ public class JpsJavaProjectExtensionImpl extends JpsElementBase return new JpsLibraryRootImpl(this); } - @Override - public void applyChanges(@NotNull JpsLibraryRootImpl modified) { - } - @Override @NotNull public JpsLibrary getLibrary() { diff --git a/jps/model-impl/src/org/jetbrains/jps/model/library/impl/sdk/JpsSdkImpl.java b/jps/model-impl/src/org/jetbrains/jps/model/library/impl/sdk/JpsSdkImpl.java index 7fae53ab6c3f..3affb9d2c357 100644 --- a/jps/model-impl/src/org/jetbrains/jps/model/library/impl/sdk/JpsSdkImpl.java +++ b/jps/model-impl/src/org/jetbrains/jps/model/library/impl/sdk/JpsSdkImpl.java @@ -1,7 +1,6 @@ // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.jetbrains.jps.model.library.impl.sdk; -import java.util.Objects; import org.jetbrains.annotations.NotNull; import org.jetbrains.jps.model.JpsElement; import org.jetbrains.jps.model.JpsElementFactory; @@ -11,6 +10,8 @@ import org.jetbrains.jps.model.library.sdk.JpsSdk; import org.jetbrains.jps.model.library.sdk.JpsSdkReference; import org.jetbrains.jps.model.library.sdk.JpsSdkType; +import java.util.Objects; + public class JpsSdkImpl

extends JpsCompositeElementBase> implements JpsSdk

{ private final JpsSdkType

mySdkType; private String myHomePath; @@ -58,13 +59,6 @@ public class JpsSdkImpl

extends JpsCompositeElementBase>)super.getParent(); } - @Override - public void applyChanges(@NotNull JpsSdkImpl

modified) { - super.applyChanges(modified); - setHomePath(modified.getHomePath()); - setVersionString(modified.getVersionString()); - } - @Override public String getHomePath() { return myHomePath; diff --git a/jps/model-serialization/src/org/jetbrains/jps/model/serialization/impl/JpsModuleSerializationDataExtensionImpl.java b/jps/model-serialization/src/org/jetbrains/jps/model/serialization/impl/JpsModuleSerializationDataExtensionImpl.java index 1327c09a65b3..70da15b4a25f 100644 --- a/jps/model-serialization/src/org/jetbrains/jps/model/serialization/impl/JpsModuleSerializationDataExtensionImpl.java +++ b/jps/model-serialization/src/org/jetbrains/jps/model/serialization/impl/JpsModuleSerializationDataExtensionImpl.java @@ -39,10 +39,6 @@ public class JpsModuleSerializationDataExtensionImpl extends JpsElementBase getOptionsForAllBuildFiles() { diff --git a/plugins/ant/jps-plugin/src/org/jetbrains/jps/ant/model/impl/JpsAntInstallationImpl.java b/plugins/ant/jps-plugin/src/org/jetbrains/jps/ant/model/impl/JpsAntInstallationImpl.java index aaa17a60df14..7ec46a6f03d5 100644 --- a/plugins/ant/jps-plugin/src/org/jetbrains/jps/ant/model/impl/JpsAntInstallationImpl.java +++ b/plugins/ant/jps-plugin/src/org/jetbrains/jps/ant/model/impl/JpsAntInstallationImpl.java @@ -52,10 +52,6 @@ public final class JpsAntInstallationImpl extends JpsElementBase { return new JpsGroovySettings(this); } - @Override - public void applyChanges(@NotNull JpsGroovySettings modified) { - } - @NotNull public static JpsGroovySettings getSettings(@NotNull JpsProject project) { JpsGroovySettings settings = project.getContainer().getChild(ROLE); diff --git a/plugins/javaFX/javaFX-jps-plugin/src/org/jetbrains/plugins/javaFX/JpsJavaFxArtifactProperties.java b/plugins/javaFX/javaFX-jps-plugin/src/org/jetbrains/plugins/javaFX/JpsJavaFxArtifactProperties.java index a3bd3af0e0a7..5be8b74886aa 100644 --- a/plugins/javaFX/javaFX-jps-plugin/src/org/jetbrains/plugins/javaFX/JpsJavaFxArtifactProperties.java +++ b/plugins/javaFX/javaFX-jps-plugin/src/org/jetbrains/plugins/javaFX/JpsJavaFxArtifactProperties.java @@ -52,11 +52,6 @@ public class JpsJavaFxArtifactProperties extends JpsElementBase