Merge "Bug 475584 - Problem in order of fragment dependances" into 0.5-maintenance
diff --git a/plugins/org.eclipse.gendoc.script.acceleo/.classpath b/plugins/org.eclipse.gendoc.script.acceleo/.classpath
index 64c5e31..8a8f166 100644
--- a/plugins/org.eclipse.gendoc.script.acceleo/.classpath
+++ b/plugins/org.eclipse.gendoc.script.acceleo/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/org.eclipse.gendoc.script.acceleo/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.gendoc.script.acceleo/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..f287d53
--- /dev/null
+++ b/plugins/org.eclipse.gendoc.script.acceleo/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/plugins/org.eclipse.gendoc.script.acceleo/src/org/eclipse/gendoc/script/services/impl/FragmentEdge.java b/plugins/org.eclipse.gendoc.script.acceleo/src/org/eclipse/gendoc/script/services/impl/FragmentEdge.java
index a9b02e5..85c0bfd 100644
--- a/plugins/org.eclipse.gendoc.script.acceleo/src/org/eclipse/gendoc/script/services/impl/FragmentEdge.java
+++ b/plugins/org.eclipse.gendoc.script.acceleo/src/org/eclipse/gendoc/script/services/impl/FragmentEdge.java
@@ -28,7 +28,6 @@
this.map = map;
}
- @Override
public List<? super Fragment> from(Fragment n) {
List<Fragment> result = new LinkedList<Fragment>();
List<String> importedFragments = n.getImportedFragments();
