From 990de8f39708dd0235fc7a5c272ab75eceb6e21a Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Tue, 22 Mar 2011 18:58:51 +0300 Subject: [PATCH] obsolete code --- .../pom/java/impl/PomJavaAspectImpl.java | 2 -- .../pom/java/events/JavaTreeChanged.java | 32 ------------------- .../java/events/PomJavaAspectChangeSet.java | 12 ------- .../xml/impl/events/XmlTagChildAddImpl.java | 14 -------- .../impl/events/XmlTagChildRemovedImpl.java | 16 ---------- 5 files changed, 76 deletions(-) delete mode 100644 java/openapi/src/com/intellij/pom/java/events/JavaTreeChanged.java diff --git a/java/java-impl/src/com/intellij/pom/java/impl/PomJavaAspectImpl.java b/java/java-impl/src/com/intellij/pom/java/impl/PomJavaAspectImpl.java index e3d0276469e1..a35bb8ec0771 100644 --- a/java/java-impl/src/com/intellij/pom/java/impl/PomJavaAspectImpl.java +++ b/java/java-impl/src/com/intellij/pom/java/impl/PomJavaAspectImpl.java @@ -23,7 +23,6 @@ import com.intellij.pom.PomModelAspect; import com.intellij.pom.event.PomModelEvent; import com.intellij.pom.java.LanguageLevel; import com.intellij.pom.java.PomJavaAspect; -import com.intellij.pom.java.events.JavaTreeChanged; import com.intellij.pom.java.events.PomJavaAspectChangeSet; import com.intellij.pom.tree.TreeAspect; import com.intellij.pom.tree.events.TreeChangeEvent; @@ -69,7 +68,6 @@ public class PomJavaAspectImpl extends PomJavaAspect implements ProjectComponent final PsiFile containingFile = changeSet.getRootElement().getPsi().getContainingFile(); if(!(containingFile.getLanguage() instanceof JavaLanguage)) return; final PomJavaAspectChangeSet set = new PomJavaAspectChangeSet(myPomModel); - set.addChange(new JavaTreeChanged(containingFile)); event.registerChangeSet(this, set); } } diff --git a/java/openapi/src/com/intellij/pom/java/events/JavaTreeChanged.java b/java/openapi/src/com/intellij/pom/java/events/JavaTreeChanged.java deleted file mode 100644 index b948b33129b9..000000000000 --- a/java/openapi/src/com/intellij/pom/java/events/JavaTreeChanged.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2000-2009 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.pom.java.events; - -import com.intellij.psi.PsiFile; - -public class JavaTreeChanged implements PomJavaChange { - private final PsiFile myFile; - - public JavaTreeChanged(final PsiFile file) { - myFile = file; - } - - public PsiFile getFile() { - return myFile; - } - -} diff --git a/java/openapi/src/com/intellij/pom/java/events/PomJavaAspectChangeSet.java b/java/openapi/src/com/intellij/pom/java/events/PomJavaAspectChangeSet.java index ebbd94c2d4e2..3ae8f6ee6d8f 100644 --- a/java/openapi/src/com/intellij/pom/java/events/PomJavaAspectChangeSet.java +++ b/java/openapi/src/com/intellij/pom/java/events/PomJavaAspectChangeSet.java @@ -22,30 +22,18 @@ import com.intellij.pom.event.PomChangeSet; import com.intellij.pom.java.PomJavaAspect; import org.jetbrains.annotations.NotNull; -import java.util.ArrayList; -import java.util.List; - public class PomJavaAspectChangeSet implements PomChangeSet{ private final PomModel myModel; - private final List myChanges = new ArrayList(); - public PomJavaAspectChangeSet(PomModel model) { myModel = model; } - public void addChange(PomJavaChange change) { - myChanges.add(change); - } - @NotNull public PomModelAspect getAspect() { return myModel.getModelAspect(PomJavaAspect.class); } public void merge(@NotNull PomChangeSet blocked) { - if(!(blocked instanceof PomJavaAspectChangeSet)) return; - final PomJavaAspectChangeSet blockedJavaChange = (PomJavaAspectChangeSet)blocked; - myChanges.addAll(blockedJavaChange.myChanges); } } diff --git a/xml/impl/src/com/intellij/pom/xml/impl/events/XmlTagChildAddImpl.java b/xml/impl/src/com/intellij/pom/xml/impl/events/XmlTagChildAddImpl.java index a4cd94334935..3ee06ba99d3c 100644 --- a/xml/impl/src/com/intellij/pom/xml/impl/events/XmlTagChildAddImpl.java +++ b/xml/impl/src/com/intellij/pom/xml/impl/events/XmlTagChildAddImpl.java @@ -15,14 +15,8 @@ */ package com.intellij.pom.xml.impl.events; -import com.intellij.pom.PomModel; -import com.intellij.pom.event.PomModelEvent; -import com.intellij.pom.xml.XmlAspect; import com.intellij.pom.xml.XmlChangeVisitor; import com.intellij.pom.xml.events.XmlTagChildAdd; -import com.intellij.pom.xml.impl.XmlAspectChangeSetImpl; -import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.psi.xml.XmlFile; import com.intellij.psi.xml.XmlTag; import com.intellij.psi.xml.XmlTagChild; @@ -42,14 +36,6 @@ public class XmlTagChildAddImpl implements XmlTagChildAdd { return myChild; } - public static PomModelEvent createXmlTagChildAdd(PomModel source, XmlTag context, XmlTagChild treeElement) { - final PomModelEvent event = new PomModelEvent(source); - final XmlAspectChangeSetImpl xmlAspectChangeSet = new XmlAspectChangeSetImpl(source, PsiTreeUtil.getParentOfType(context, XmlFile.class)); - xmlAspectChangeSet.add(new XmlTagChildAddImpl(context, treeElement)); - event.registerChangeSet(source.getModelAspect(XmlAspect.class), xmlAspectChangeSet); - return event; - } - @SuppressWarnings({"HardCodedStringLiteral"}) public String toString() { return "child added to " + getTag().getName() + " child: " + myChild.toString(); diff --git a/xml/impl/src/com/intellij/pom/xml/impl/events/XmlTagChildRemovedImpl.java b/xml/impl/src/com/intellij/pom/xml/impl/events/XmlTagChildRemovedImpl.java index 23c88d401220..dd92cac98792 100644 --- a/xml/impl/src/com/intellij/pom/xml/impl/events/XmlTagChildRemovedImpl.java +++ b/xml/impl/src/com/intellij/pom/xml/impl/events/XmlTagChildRemovedImpl.java @@ -15,17 +15,8 @@ */ package com.intellij.pom.xml.impl.events; -import com.intellij.pom.PomModel; -import com.intellij.pom.event.PomModelEvent; -import com.intellij.pom.xml.XmlAspect; import com.intellij.pom.xml.XmlChangeVisitor; -import com.intellij.pom.xml.events.XmlChange; import com.intellij.pom.xml.events.XmlTagChildRemoved; -import com.intellij.pom.xml.impl.XmlAspectChangeSetImpl; -import com.intellij.pom.xml.XmlChangeVisitor; -import com.intellij.pom.xml.impl.XmlAspectChangeSetImpl; -import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.psi.xml.XmlFile; import com.intellij.psi.xml.XmlTag; import com.intellij.psi.xml.XmlTagChild; @@ -45,13 +36,6 @@ public class XmlTagChildRemovedImpl implements XmlTagChildRemoved { return myChild; } - public static PomModelEvent createXmlTagChildRemoved(PomModel source, XmlTag context, XmlTagChild treeElement) { - final PomModelEvent event = new PomModelEvent(source); - final XmlAspectChangeSetImpl xmlAspectChangeSet = new XmlAspectChangeSetImpl(source, PsiTreeUtil.getParentOfType(context, XmlFile.class)); - xmlAspectChangeSet.add(new XmlTagChildRemovedImpl(context, treeElement)); - event.registerChangeSet(source.getModelAspect(XmlAspect.class), xmlAspectChangeSet); - return event; - } @SuppressWarnings({"HardCodedStringLiteral"}) public String toString() { return "child removed from " + getTag().getName() + " child: " + myChild.toString();