From 2f1d21f481b508799f67cc8ef558b2edad4cfa7d Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Tue, 24 Mar 2015 14:57:24 +0100 Subject: [PATCH] cleanup --- .../src/AbstractEclipseClasspathReader.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/plugins/eclipse/common-eclipse-util/src/AbstractEclipseClasspathReader.java b/plugins/eclipse/common-eclipse-util/src/AbstractEclipseClasspathReader.java index 540318670333..fdfaa0051e58 100644 --- a/plugins/eclipse/common-eclipse-util/src/AbstractEclipseClasspathReader.java +++ b/plugins/eclipse/common-eclipse-util/src/AbstractEclipseClasspathReader.java @@ -94,7 +94,6 @@ public abstract class AbstractEclipseClasspathReader { throw new ConversionException("Missing classpathentry/@kind"); } - String path = element.getAttributeValue(EclipseXml.PATH_ATTR); if (path == null) { //noinspection SpellCheckingInspection @@ -136,7 +135,6 @@ public abstract class AbstractEclipseClasspathReader { } } } - else if (kind.equals(EclipseXml.OUTPUT_KIND)) { String output = myRootPath + "/" + path; String linked = expandLinkedResourcesPath(macroMap, path); @@ -148,10 +146,7 @@ public abstract class AbstractEclipseClasspathReader { } setupOutput(rootModel, output); } - else if (kind.equals(EclipseXml.LIB_KIND)) { - final String libName = getPresentableName(path, libs); - String linked = expandLinkedResourcesPath(macroMap, path); String url; if (linked != null) { @@ -183,7 +178,7 @@ public abstract class AbstractEclipseClasspathReader { } } - addModuleLibrary(rootModel, element, exported, libName, url, srcUrl, macroMap); + addModuleLibrary(rootModel, element, exported, getPresentableName(path, libs), url, srcUrl, macroMap); } else if (kind.equals(EclipseXml.VAR_KIND)) { int slash = path.indexOf("/");