Skip to content

Commit 70deaef

Browse files
dupuisadupuisa
authored
Merge pull request #64 from opcoach/V3-dev
V3 dev, Integrate command line, and fix #11, 12 and 13
2 parents 5697c4a + a4b2d1c commit 70deaef

File tree

230 files changed

+1208
-128959
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

230 files changed

+1208
-128959
lines changed

‎.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22

33
# Ignore build directories (eclipse bin and maven target)
44
bin/
5+
target/
56
*/target/**
67

78
# Ignore code generation directories
89
*/src-gen/fr/
910

1011
#Ignore checkstyle configuration
11-
*.checkstyle
12+
*.checkstyle

‎fr.cnes.analysis.tools.analyzer/META-INF/MANIFEST.MF

-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,5 @@ Export-Package: fr.cnes.analysis.tools.analyzer;uses:="org.osgi.framework,org.ec
1313
fr.cnes.analysis.tools.analyzer.exception,
1414
fr.cnes.analysis.tools.analyzer.services.checkers,
1515
fr.cnes.analysis.tools.analyzer.services.languages
16-
Import-Package: org.junit
1716
Bundle-Vendor: CNES
1817
Bundle-ClassPath: .

‎fr.cnes.analysis.tools.analyzer/plugin.xml

+1-22
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,5 @@
33
<plugin>
44
<extension-point id="languages" name="languages" schema="schema/languages.exsd"/>
55
<extension-point id="checks" name="checks" schema="schema/checks.exsd"/>
6-
<extension
7-
id="application"
8-
point="org.eclipse.core.runtime.applications">
9-
<application
10-
cardinality="*"
11-
thread="main"
12-
visible="true">
13-
<run
14-
class="fr.cnes.analysis.tools.analyzer.AnalyzerApplication">
15-
</run>
16-
</application>
17-
</extension>
18-
<extension
19-
id="product"
20-
name="Icode command line product"
21-
point="org.eclipse.core.runtime.products">
22-
<product
23-
application="fr.cnes.analysis.tools.analyzer.application"
24-
description="The product to run icode using a commande line "
25-
name="Cnes Icode Command Line product">
26-
</product>
27-
</extension>
6+
287
</plugin>

‎fr.cnes.analysis.tools.export.xml/src/fr/cnes/analysis/tools/export/xml/ExportXml.java

+20-20
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,16 @@ public class ExportXml implements IExport {
3939
public static String ATTRIBUTE_AnalysisProjectVersion = "analysisProjectVersion";
4040
/** Identifier of element <i>AnalysisProject</i>. */
4141
public static String ELEMENT_AnalysisProject = "analysisProject";
42-
/** Default <i>analysisProject</i> name. */
43-
private String analysisProject_key = "Project name";
44-
/** Default <i>analysisAuthor</i> value. */
45-
private String analysisAuthor_key = "Analysis author";
46-
/** Default <i>projectVersion</i> value. */
47-
private String analysisProjectVersion_key = "Project version";
48-
/** Default <i>projectVersion</i> value. */
49-
private String analysisConfigurationId_key = "Analysis configuration (id)";
50-
/** DEfault <i>analysisDate</i> value */
51-
private String analysisDate_key = "Analysis date (YYYY-MM-DD)";
42+
/** <i>PROJECT_NAME </i> parameter. */
43+
public static final String PARAM_PROJECT_NAME = "ProjectName";
44+
/** Default <i>AUTHOR</i> parameter. */
45+
public static final String PARAM_AUTHOR = "Analysis author";
46+
/** Default <i>PROJECT_VERSION</i> parameter. */
47+
public static final String PARAM_PROJECT_VERSION = "ProjectVersion";
48+
/** <i>CONFIGURATION_ID</i> parameter. */
49+
public static final String PARAM_CONFIGURATION_ID = "AnalysisConfigurationID";
50+
/** DEfault <i>analysisDate</i> parameter */
51+
public static final String PARAM_DATE = "Date";
5252
/** Parameter required by this export. */
5353
private Map<String, String> parameters;
5454

@@ -58,11 +58,11 @@ public class ExportXml implements IExport {
5858
*/
5959
public ExportXml() {
6060
this.parameters = new TreeMap<>();
61-
this.parameters.put(analysisProject_key, "Unknown");
62-
this.parameters.put(analysisAuthor_key, "i-Code CNES Analyzer");
63-
this.parameters.put(analysisProjectVersion_key, "1.0.0");
64-
this.parameters.put(analysisDate_key, this.currentDate());
65-
this.parameters.put(analysisConfigurationId_key, "analysis1");
61+
this.parameters.put(PARAM_PROJECT_NAME, "Unknown");
62+
this.parameters.put(PARAM_AUTHOR, "i-Code CNES Analyzer");
63+
this.parameters.put(PARAM_PROJECT_VERSION, "1.0.0");
64+
this.parameters.put(PARAM_DATE, this.currentDate());
65+
this.parameters.put(PARAM_CONFIGURATION_ID, "analysis1");
6666

6767
}
6868

@@ -94,9 +94,9 @@ public void export(List<CheckResult> checkResults, File outputFile,
9494

9595
final Element analysisProjectElement = new Element(ELEMENT_AnalysisProject);
9696
analysisProjectElement.setAttribute(
97-
new Attribute(ATTRIBUTE_AnalysisProjectName, parameters.get(analysisProject_key)));
97+
new Attribute(ATTRIBUTE_AnalysisProjectName, parameters.get(PARAM_PROJECT_NAME)));
9898
analysisProjectElement.setAttribute(new Attribute(ATTRIBUTE_AnalysisProjectVersion,
99-
parameters.get(analysisProjectVersion_key)));
99+
parameters.get(PARAM_PROJECT_VERSION)));
100100
final Document document = new Document(analysisProjectElement);
101101

102102
// BEGINNING OF SEQUENCE <xsd:sequence>
@@ -106,9 +106,9 @@ public void export(List<CheckResult> checkResults, File outputFile,
106106

107107
final Element analysisInformation = new Element("analysisInformations");
108108
attributes.add(new Attribute("analysisConfigurationId",
109-
parameters.get(analysisConfigurationId_key)));
110-
attributes.add(new Attribute("analysisDate", parameters.get(analysisDate_key)));
111-
attributes.add(new Attribute("author", parameters.get(analysisAuthor_key)));
109+
parameters.get(PARAM_CONFIGURATION_ID)));
110+
attributes.add(new Attribute("analysisDate", parameters.get(PARAM_DATE)));
111+
attributes.add(new Attribute("author", parameters.get(PARAM_AUTHOR)));
112112

113113
analysisInformation.setAttributes(attributes);
114114
document.getRootElement().addContent(analysisInformation);

‎fr.cnes.analysis.tools.fortran77.metrics/META-INF/MANIFEST.MF

-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,4 @@ Require-Bundle: org.eclipse.core.runtime,
99
Bundle-ActivationPolicy: lazy
1010
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
1111
Export-Package: fr.cnes.analysis.tools.fortran77.metrics
12-
Import-Package: org.junit,
13-
org.junit.runner,
14-
org.junit.runners
1512
Bundle-Vendor: CNES

‎fr.cnes.analysis.tools.fortran77.metrics/build.xml

+8-40
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,12 @@
11
<project name="Metrics" default="generate-all" basedir=".">
2-
3-
<property name="jflex-jar" value="../fr.cnes.analysis.tools.jflex/lib/jflex-1.6.1/lib/jflex-1.6.1.jar"></property>
4-
<property name="dest" value="src-gen/fr/cnes/analysis/tools/fortran77/metrics"></property>
52

6-
<target name="clean">
7-
<delete dir="src-gen/fr"/>
8-
</target>
3+
<!-- Override the properties used in the generateLex.xml before importing it -->
4+
<property name="dest" value="src-gen/fr/cnes/analysis/tools/fortran77/metrics"/>
5+
<property name="absdest" location="${dest}"/>
6+
<property name="excludedLex" value="ExampleMetric.lex"/>
97

10-
<target name="generate-all">
11-
<antcall target="generate-F77METComplexitySimplified"></antcall>
12-
<antcall target="generate-F77METLineOfCode"></antcall>
13-
<antcall target="generate-F77METNesting"></antcall>
14-
<antcall target="generate-F77METRatioComment"></antcall>
15-
</target>
16-
<target name="generate-F77METComplexitySimplified">
17-
<java jar="${jflex-jar}" fork="true" failonerror="true" maxmemory="128m">
18-
<arg value="lex/F77METComplexitySimplified.lex" />
19-
</java>
20-
<move file="lex/F77METComplexitySimplified.java" todir="${dest}">
21-
</move>
22-
</target>
23-
<target name="generate-F77METLineOfCode">
24-
<java jar="${jflex-jar}" fork="true" failonerror="true" maxmemory="128m">
25-
<arg value="lex/F77METLineOfCode.lex" />
26-
</java>
27-
<move file="lex/F77METLineOfCode.java" todir="${dest}">
28-
</move>
29-
</target>
30-
<target name="generate-F77METNesting">
31-
<java jar="${jflex-jar}" fork="true" failonerror="true" maxmemory="128m">
32-
<arg value="lex/F77METNesting.lex" />
33-
</java>
34-
<move file="lex/F77METNesting.java" todir="${dest}">
35-
</move>
36-
</target>
37-
<target name="generate-F77METRatioComment">
38-
<java jar="${jflex-jar}" fork="true" failonerror="true" maxmemory="128m">
39-
<arg value="lex/F77METRatioComment.lex" />
40-
</java>
41-
<move file="lex/F77METRatioComment.java" todir="${dest}">
42-
</move>
43-
</target>
8+
9+
<!-- Warning : must import the file after properties override -->
10+
<import file="../generateLex.xml"/>
11+
4412
</project>

‎fr.cnes.analysis.tools.fortran77.metrics/pom.xml

+1-31
Original file line numberDiff line numberDiff line change
@@ -17,38 +17,8 @@
1717
<plugins>
1818
<plugin>
1919
<artifactId>maven-antrun-plugin</artifactId>
20-
<executions>
21-
<execution>
22-
<id>generateflex</id>
23-
<phase>generate-sources</phase>
24-
<configuration>
25-
<target>
26-
<ant antfile="build.xml">
27-
<target name="generate-all" />
28-
</ant>
29-
</target>
30-
</configuration>
31-
<goals>
32-
<goal>run</goal>
33-
</goals>
34-
</execution>
35-
<execution>
36-
<id>clean</id>
37-
<phase>clean</phase>
38-
<configuration>
39-
<target>
40-
<ant antfile="build.xml">
41-
<target name="clean" />
42-
</ant>
43-
</target>
44-
</configuration>
45-
<goals>
46-
<goal>run</goal>
47-
</goals>
48-
</execution>
49-
</executions>
5020
</plugin>
5121
</plugins>
5222
</build>
53-
23+
5424
</project>

‎fr.cnes.analysis.tools.fortran77.rules/META-INF/MANIFEST.MF

-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,4 @@ Require-Bundle: org.eclipse.core.runtime,
99
Bundle-ActivationPolicy: lazy
1010
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
1111
Export-Package: fr.cnes.analysis.tools.fortran77.rules
12-
Import-Package: org.junit,
13-
org.junit.runner,
14-
org.junit.runners
1512
Bundle-Vendor: CNES

0 commit comments

Comments
 (0)