summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakosyakov2013-07-09 10:03:03 (EDT)
committer Gerrit Code Review @ Eclipse.org2013-07-09 13:36:07 (EDT)
commit0f27f41ea54b349b2b9601d42fe8e7c0a1e50120 (patch)
tree14f862c325a1173351d11dc01912deacbe2f0ae8
parentf2c61ff59a7faf8b43f1d2cfe4ff113858083e23 (diff)
downloadorg.eclipse.xtext-0f27f41ea54b349b2b9601d42fe8e7c0a1e50120.zip
org.eclipse.xtext-0f27f41ea54b349b2b9601d42fe8e7c0a1e50120.tar.gz
org.eclipse.xtext-0f27f41ea54b349b2b9601d42fe8e7c0a1e50120.tar.bz2
https://xtext-builds.itemis.de/jenkins/view/Gerrit/job/xtext.gerrit.analysis/558/findbugsResult/NORMAL/package.825141655/:refs/changes/03/14403/2
resolved Change-Id: I3b8c5d78c2f555c61bffca18636cf65f151b00dc Signed-off-by: akosyakov <anton.kosyakov@itemis.de>
-rw-r--r--plugins/org.eclipse.xtend.ide/src/org/eclipse/xtend/ide/macro/fsaccess/EclipseFileSystemAccessImpl.xtend2
-rw-r--r--plugins/org.eclipse.xtend.ide/xtend-gen/org/eclipse/xtend/ide/macro/fsaccess/EclipseFileSystemAccessImpl.java5
2 files changed, 5 insertions, 2 deletions
diff --git a/plugins/org.eclipse.xtend.ide/src/org/eclipse/xtend/ide/macro/fsaccess/EclipseFileSystemAccessImpl.xtend b/plugins/org.eclipse.xtend.ide/src/org/eclipse/xtend/ide/macro/fsaccess/EclipseFileSystemAccessImpl.xtend
index c145e9a..3414eb8 100644
--- a/plugins/org.eclipse.xtend.ide/src/org/eclipse/xtend/ide/macro/fsaccess/EclipseFileSystemAccessImpl.xtend
+++ b/plugins/org.eclipse.xtend.ide/src/org/eclipse/xtend/ide/macro/fsaccess/EclipseFileSystemAccessImpl.xtend
@@ -61,7 +61,7 @@ class EclipseFileSystemAccessImpl extends AbstractFileSystemAccessImpl {
}
javaProject.getResolvedClasspath(true).filter [
entryKind == IClasspathEntry.CPE_SOURCE && path.isPrefixOf(filePath)
- ].head?.path.removeFirstSegments(1)
+ ].head?.path?.removeFirstSegments(1)
}
def getOutputConfig(IFile it) {
diff --git a/plugins/org.eclipse.xtend.ide/xtend-gen/org/eclipse/xtend/ide/macro/fsaccess/EclipseFileSystemAccessImpl.java b/plugins/org.eclipse.xtend.ide/xtend-gen/org/eclipse/xtend/ide/macro/fsaccess/EclipseFileSystemAccessImpl.java
index 53ffb8a..6c77750 100644
--- a/plugins/org.eclipse.xtend.ide/xtend-gen/org/eclipse/xtend/ide/macro/fsaccess/EclipseFileSystemAccessImpl.java
+++ b/plugins/org.eclipse.xtend.ide/xtend-gen/org/eclipse/xtend/ide/macro/fsaccess/EclipseFileSystemAccessImpl.java
@@ -137,7 +137,10 @@ public class EclipseFileSystemAccessImpl extends AbstractFileSystemAccessImpl {
if (_head!=null) {
_path=_head.getPath();
}
- IPath _removeFirstSegments = _path.removeFirstSegments(1);
+ IPath _removeFirstSegments = null;
+ if (_path!=null) {
+ _removeFirstSegments=_path.removeFirstSegments(1);
+ }
_xblockexpression = (_removeFirstSegments);
}
return _xblockexpression;