Skip to content

Commit

Permalink
Merge branch 'AnalyzerSimplification' into V3-dev
Browse files Browse the repository at this point in the history
Conflicts:
	fr.cnes.analysis.tools.analyzer/src/fr/cnes/analysis/tools/analyzer/RuleAnalysisJob.java
	fr.cnes.analysis.tools.analyzer/src/fr/cnes/analysis/tools/analyzer/RuleAnalyzer.java
	fr.cnes.analysis.tools.ui/src/fr/cnes/analysis/tools/ui/handler/RuleAnalysisHandler.java
	fr.cnes.analysis.tools.ui/src/fr/cnes/analysis/tools/ui/view/ViolationsView.java
	tests/fr.cnes.analysis.tools.fortran77.rules.test/src/fr/cnes/analysis/tools/fortran77/rules/TestGlobal_1.java
	tests/fr.cnes.analysis.tools.fortran77.rules.test/src/fr/cnes/analysis/tools/fortran77/rules/TestGlobal_2.java
	tests/fr.cnes.analysis.tools.fortran77.rules.test/src/fr/cnes/analysis/tools/fortran77/rules/TestGlobal_3.java
	tests/fr.cnes.analysis.tools.fortran77.rules.test/src/fr/cnes/analysis/tools/fortran77/rules/TestGlobal_4.java
	tests/fr.cnes.analysis.tools.fortran90.rules.test/src/fr/cnes/analysis/tools/fortran90/rules/TestGlobal_1.java
	tests/fr.cnes.analysis.tools.fortran90.rules.test/src/fr/cnes/analysis/tools/fortran90/rules/TestGlobal_2.java
	tests/fr.cnes.analysis.tools.shell.rules.test/src/fr/cnes/analysis/tools/shell/rules/TestGlobal.java
  • Loading branch information
Omar WALDMANN committed May 30, 2017
2 parents d6aacab + edafe37 commit bd6202d
Show file tree
Hide file tree
Showing 40 changed files with 5,079 additions and 6,408 deletions.
14 changes: 7 additions & 7 deletions fr.cnes.analysis.tools.analyzer/.classpath
Original file line number Diff line number Diff line change
@@ -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/JavaSE-1.8"/>
<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.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
1 change: 1 addition & 0 deletions fr.cnes.analysis.tools.analyzer/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ Export-Package: fr.cnes.analysis.tools.analyzer;uses:="org.osgi.framework,org.ec
fr.cnes.analysis.tools.analyzer.exception
Import-Package: org.junit
Bundle-Vendor: CNES
Bundle-ClassPath: .
1 change: 1 addition & 0 deletions fr.cnes.analysis.tools.analyzer/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ output.. = bin/
bin.includes = META-INF/,\
.,\
plugin.xml
source.. = src/
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@

<element name="analyzer">
<complexType>
<sequence>
<element ref="fileExtension" minOccurs="1" maxOccurs="unbounded"/>
</sequence>
<attribute name="id" type="string" use="required">
<annotation>
<documentation>
Expand All @@ -73,6 +76,18 @@
</complexType>
</element>

<element name="fileExtension">
<complexType>
<attribute name="name" type="string">
<annotation>
<documentation>

</documentation>
</annotation>
</attribute>
</complexType>
</element>

<annotation>
<appinfo>
<meta.section type="since"/>
Expand Down

This file was deleted.

Loading

0 comments on commit bd6202d

Please sign in to comment.