From 090c63bce1b0fb500f61e07f79224e0b72368a00 Mon Sep 17 00:00:00 2001 From: nik Date: Mon, 26 Oct 2009 11:19:34 +0300 Subject: [PATCH] obsolete code removed --- .../impl/ConfigFileFactoryImpl.java | 4 - .../impl/CustomConfigFileSetImpl.java | 99 ------------------- .../util/descriptors/ConfigFileFactory.java | 2 - .../util/descriptors/CustomConfigFileSet.java | 37 ------- 4 files changed, 142 deletions(-) delete mode 100644 java/idea-ui/src/com/intellij/util/descriptors/impl/CustomConfigFileSetImpl.java delete mode 100644 java/openapi/src/com/intellij/util/descriptors/CustomConfigFileSet.java diff --git a/java/idea-ui/src/com/intellij/util/descriptors/impl/ConfigFileFactoryImpl.java b/java/idea-ui/src/com/intellij/util/descriptors/impl/ConfigFileFactoryImpl.java index 1729b51869e8..e8a101647071 100644 --- a/java/idea-ui/src/com/intellij/util/descriptors/impl/ConfigFileFactoryImpl.java +++ b/java/idea-ui/src/com/intellij/util/descriptors/impl/ConfigFileFactoryImpl.java @@ -55,10 +55,6 @@ public class ConfigFileFactoryImpl extends ConfigFileFactory { return new ConfigFileContainerImpl(project, metaDataProvider, (ConfigFileInfoSetImpl)configuration); } - public CustomConfigFileSet createCustomConfigFileSet() { - return new CustomConfigFileSetImpl(); - } - private static String getText(final String templateName) throws IOException { final FileTemplateManager templateManager = FileTemplateManager.getInstance(); final FileTemplate template = templateManager.getJ2eeTemplate(templateName); diff --git a/java/idea-ui/src/com/intellij/util/descriptors/impl/CustomConfigFileSetImpl.java b/java/idea-ui/src/com/intellij/util/descriptors/impl/CustomConfigFileSetImpl.java deleted file mode 100644 index 2b715b33d15c..000000000000 --- a/java/idea-ui/src/com/intellij/util/descriptors/impl/CustomConfigFileSetImpl.java +++ /dev/null @@ -1,99 +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.util.descriptors.impl; - -import com.intellij.openapi.util.WriteExternalException; -import com.intellij.util.descriptors.CustomConfigFile; -import com.intellij.util.descriptors.CustomConfigFileSet; -import org.jdom.Element; -import org.jetbrains.annotations.NonNls; -import org.jetbrains.annotations.Nullable; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -/** - * @author nik - */ -public class CustomConfigFileSetImpl implements CustomConfigFileSet { - @NonNls private static final String ELEMENT_NAME = "deploymentDescriptor"; - @NonNls private static final String URL_ATTRIBUTE = "url"; - @NonNls private static final String OPTION_ELEMENT_NAME = "option"; - @NonNls private static final String DEFAULT_DIR_OPTION = "DEFAULT_DIR"; - @NonNls private static final String NAME_ATTRIBUTE = "name"; - @NonNls private static final String VALUE_ATTRIBUTE = "value"; - - private final List myDescriptors = new ArrayList(); - - public void add(CustomConfigFile descriptor) { - myDescriptors.add(descriptor); - } - - public void remove(CustomConfigFile descriptor) { - myDescriptors.remove(descriptor); - } - - public CustomConfigFile[] getConfigFiles() { - return myDescriptors.toArray(new CustomConfigFile[myDescriptors.size()]); - } - - public void setConfigFiles(final Collection descriptors) { - myDescriptors.clear(); - myDescriptors.addAll(descriptors); - } - - public void readExternal(Element element) { - doReadExternal(element, new ArrayList()); - } - - public void doReadExternal(Element element, List descriptorElements) { - myDescriptors.clear(); - List descriptors = element.getChildren(ELEMENT_NAME); - for (Element descriptor : descriptors) { - String url = descriptor.getAttributeValue(URL_ATTRIBUTE); - String directory = getDefaultDirOption(descriptor); - if (directory != null) { - myDescriptors.add(new CustomConfigFile(url, directory)); - descriptorElements.add(descriptor); - } - } - } - - @Nullable - private static String getDefaultDirOption(final Element descriptor) { - List options = descriptor.getChildren(OPTION_ELEMENT_NAME); - for (Element option : options) { - if (DEFAULT_DIR_OPTION.equals(option.getAttributeValue(NAME_ATTRIBUTE))) { - return option.getAttributeValue(VALUE_ATTRIBUTE); - } - } - return null; - } - - public void writeExternal(Element element) throws WriteExternalException { - for (CustomConfigFile descriptor : myDescriptors) { - final Element child = new Element(ELEMENT_NAME); - child.setAttribute(URL_ATTRIBUTE, descriptor.getUrl()); - final Element option = new Element(OPTION_ELEMENT_NAME); - option.setAttribute(NAME_ATTRIBUTE, DEFAULT_DIR_OPTION); - option.setAttribute(VALUE_ATTRIBUTE, descriptor.getOutputDirectoryPath()); - child.addContent(option); - element.addContent(child); - } - } -} diff --git a/java/openapi/src/com/intellij/util/descriptors/ConfigFileFactory.java b/java/openapi/src/com/intellij/util/descriptors/ConfigFileFactory.java index aa81db0eaffa..34690fe90c48 100644 --- a/java/openapi/src/com/intellij/util/descriptors/ConfigFileFactory.java +++ b/java/openapi/src/com/intellij/util/descriptors/ConfigFileFactory.java @@ -40,8 +40,6 @@ public abstract class ConfigFileFactory { public abstract ConfigFileMetaDataRegistry createMetaDataRegistry(); - public abstract CustomConfigFileSet createCustomConfigFileSet(); - @Nullable public abstract VirtualFile createFile(@Nullable Project project, String url, ConfigFileVersion version, final boolean forceNew); diff --git a/java/openapi/src/com/intellij/util/descriptors/CustomConfigFileSet.java b/java/openapi/src/com/intellij/util/descriptors/CustomConfigFileSet.java deleted file mode 100644 index 5437ef8205fd..000000000000 --- a/java/openapi/src/com/intellij/util/descriptors/CustomConfigFileSet.java +++ /dev/null @@ -1,37 +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.util.descriptors; - -import com.intellij.openapi.util.JDOMExternalizable; - -import java.util.Collection; - -/** - * @author nik - * - * todo[nik] delete - */ -public interface CustomConfigFileSet extends JDOMExternalizable { - - void add(CustomConfigFile descriptor); - - void remove(CustomConfigFile descriptor); - - CustomConfigFile[] getConfigFiles(); - - void setConfigFiles(Collection descriptors); -}