Commit aef20c2d authored by Dominique Marcadet's avatar Dominique Marcadet

Merge branch '6-update-to-new-repository-name' into 'master'

Resolve "update to new repository name"

Closes #6

See merge request !6
parents c0ea26ac 1a5f577e
Pipeline #7792 passed with stages
in 37 seconds
......@@ -9,12 +9,12 @@
<parent>
<groupId>fr.centralesupelec.edf.riseclipse</groupId>
<artifactId>RiseClipseOCLValidator_EntsoeCim16</artifactId>
<artifactId>RiseClipseValidator_CGMES-2-4-15</artifactId>
<version>1.1.0-SNAPSHOT</version>
</parent>
<properties>
<toolName>RiseClipseEntsoeCim16ValidatorApplication</toolName>
<toolName>RiseClipseValidatorCGMESApplication</toolName>
</properties>
<build>
......@@ -39,7 +39,7 @@
<configuration>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>fr.centralesupelec.edf.riseclipse.cim.cim16.entsoe_v2_4_15.validator.ui.application.RiseClipseEntsoeCim16ValidatorApplication</mainClass>
<mainClass>fr.centralesupelec.edf.riseclipse.cim.cim16.entsoe_v2_4_15.validator.ui.application.RiseClipseValidatorCGMESApplication</mainClass>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>plugin.properties</resource>
......
......@@ -29,8 +29,8 @@ import javax.swing.JFileChooser;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import fr.centralesupelec.edf.riseclipse.cim.cim16.entsoe_v2_4_15.validator.RiseClipseEntsoeCim16Validator;
import fr.centralesupelec.edf.riseclipse.cim.cim16.entsoe_v2_4_15.validator.ui.application.RiseClipseEntsoeCim16ValidatorApplication;
import fr.centralesupelec.edf.riseclipse.cim.cim16.entsoe_v2_4_15.validator.RiseClipseValidatorCGMES;
import fr.centralesupelec.edf.riseclipse.cim.cim16.entsoe_v2_4_15.validator.ui.application.RiseClipseValidatorCGMESApplication;
import fr.centralesupelec.edf.riseclipse.util.AbstractRiseClipseConsole;
import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole;
......@@ -40,9 +40,9 @@ public class CgmesFilePane extends JPanel implements ActionListener {
private JButton btnAddCgmesFile;
private JButton btnValidate;
private CgmesFileList cgmesFilesList;
private RiseClipseEntsoeCim16ValidatorApplication application;
private RiseClipseValidatorCGMESApplication application;
public CgmesFilePane( RiseClipseEntsoeCim16ValidatorApplication application ) {
public CgmesFilePane( RiseClipseValidatorCGMESApplication application ) {
this.application = application;
setLayout( new BorderLayout( 0, 0 ));
......@@ -85,14 +85,14 @@ public class CgmesFilePane extends JPanel implements ActionListener {
IRiseClipseConsole console = result.getMainConsole();
AbstractRiseClipseConsole.changeConsole( console );
RiseClipseEntsoeCim16Validator.displayLegal( console );
RiseClipseEntsoeCim16Validator.prepare( oclFiles );
RiseClipseValidatorCGMES.displayLegal( console );
RiseClipseValidatorCGMES.prepare( oclFiles );
result.repaint();
for( int i = 0; i < sclFiles.size(); ++i ) {
console = result.getConsoleFor( sclFiles.get( i ));
AbstractRiseClipseConsole.changeConsole( console );
RiseClipseEntsoeCim16Validator.resetLoadFinalize( console, sclFiles.get( i ));
RiseClipseEntsoeCim16Validator.run( console );
RiseClipseValidatorCGMES.resetLoadFinalize( console, sclFiles.get( i ));
RiseClipseValidatorCGMES.run( console );
result.repaint();
}
......
......@@ -29,7 +29,7 @@ public class ResultFrame extends JFrame {
private JTabbedPane tabbedPane;
public ResultFrame() {
setTitle( "RiseClipseEntsoeCim16Validator results" );
setTitle( "RiseClipseValidatorCGMES results" );
setBounds( 200, 200, 800, 600 );
tabbedPane = new JTabbedPane( JTabbedPane.TOP );
......@@ -40,7 +40,7 @@ public class ResultFrame extends JFrame {
public IRiseClipseConsole getMainConsole() {
ResultPane console = new ResultPane( null, false );
tabbedPane.addTab( "RiseClipseEntsoeCim16Validator", null, console, null );
tabbedPane.addTab( "RiseClipseValidatorCGMES", null, console, null );
return console;
}
......
......@@ -31,7 +31,7 @@ import fr.centralesupelec.edf.riseclipse.cim.cim16.entsoe_v2_4_15.validator.comp
import javax.swing.JScrollPane;
import javax.swing.JPanel;
public class RiseClipseEntsoeCim16ValidatorApplication {
public class RiseClipseValidatorCGMESApplication {
private JFrame frame;
private OCLFilePane oclTree;
......@@ -43,7 +43,7 @@ public class RiseClipseEntsoeCim16ValidatorApplication {
EventQueue.invokeLater( new Runnable() {
public void run() {
try {
RiseClipseEntsoeCim16ValidatorApplication window = new RiseClipseEntsoeCim16ValidatorApplication();
RiseClipseValidatorCGMESApplication window = new RiseClipseValidatorCGMESApplication();
window.frame.setVisible( true );
}
catch( Exception e ) {
......@@ -56,7 +56,7 @@ public class RiseClipseEntsoeCim16ValidatorApplication {
/**
* Create the application.
*/
public RiseClipseEntsoeCim16ValidatorApplication() {
public RiseClipseValidatorCGMESApplication() {
initialize();
}
......@@ -65,7 +65,7 @@ public class RiseClipseEntsoeCim16ValidatorApplication {
*/
private void initialize() {
frame = new JFrame();
frame.setTitle( "RiseClipseEntsoeCim16ValidatorApplication" );
frame.setTitle( "RiseClipseValidatorCGMESApplication" );
frame.setBounds( 100, 100, 800, 600 );
frame.setDefaultCloseOperation( JFrame.EXIT_ON_CLOSE );
......
......@@ -9,12 +9,12 @@
<parent>
<groupId>fr.centralesupelec.edf.riseclipse</groupId>
<artifactId>RiseClipseOCLValidator_EntsoeCim16</artifactId>
<artifactId>RiseClipseValidator_CGMES-2-4-15</artifactId>
<version>1.1.0-SNAPSHOT</version>
</parent>
<properties>
<toolName>RiseClipseEntsoeCim16Validator</toolName>
<toolName>RiseClipseValidatorCGMES</toolName>
</properties>
<build>
......@@ -39,7 +39,7 @@
<configuration>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>fr.centralesupelec.edf.riseclipse.cim.cim16.entsoe_v2_4_15.validator.RiseClipseEntsoeCim16Validator</mainClass>
<mainClass>fr.centralesupelec.edf.riseclipse.cim.cim16.entsoe_v2_4_15.validator.RiseClipseValidatorCGMES</mainClass>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>plugin.properties</resource>
......
......@@ -50,7 +50,7 @@ import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.ocl.pivot.validation.ComposedEValidator;
public class RiseClipseEntsoeCim16Validator {
public class RiseClipseValidatorCGMES {
private static OCLValidator oclValidator;
private static CimItemProviderAdapterFactory adapter;
......@@ -61,7 +61,7 @@ public class RiseClipseEntsoeCim16Validator {
IRiseClipseConsole console = AbstractRiseClipseConsole.getConsole();
console.setLevel( IRiseClipseConsole.INFO_LEVEL );
console.info( "java -jar RiseClipseEntsoeCim16Validator.jar [--verbose | --info | --warning | --error] [--output <file>] [--merge] [<oclFile> | <cimFile>]*" );
console.info( "java -jar RiseClipseValidatorCGMES.jar [--verbose | --info | --warning | --error] [--output <file>] [--merge] [<oclFile> | <cimFile>]*" );
console.info( "Files ending with \".ocl\" are considered OCL files, all others are considered ENTSOE CGMES v2.4.15 files" );
console.info( "If --merge, all ENTSOE CGMES v2.4.15 files are merged before OCL validation" );
System.exit( -1 );
......@@ -162,7 +162,7 @@ public class RiseClipseEntsoeCim16Validator {
console.info( "Web site:" );
console.info( " http://wdi.supelec.fr/software/RiseClipse/" );
console.info( "" );
console.info( "RiseClipseEntsoeCim16Validator version: 1.1.0 a1 (3 July 2019)" );
console.info( "RiseClipseValidatorCGMES version: 1.1.0 a2 (3 July 2019)" );
console.info( "" );
}
......
......@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>fr.centralesupelec.edf.riseclipse</groupId>
<artifactId>RiseClipseOCLValidator_EntsoeCim16</artifactId>
<artifactId>RiseClipseValidator_CGMES-2-4-15</artifactId>
<version>1.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
......@@ -15,8 +15,8 @@
</parent>
<scm>
<connection>scm:git:git@gitlab.centralesupelec.fr:RiseClipseGroup/RiseClipseOCLValidator_EntsoeCim16.git</connection>
<developerConnection>scm:git:git@gitlab.centralesupelec.fr:RiseClipseGroup/RiseClipseOCLValidator_EntsoeCim16.git</developerConnection>
<connection>scm:git:git@gitlab.centralesupelec.fr:RiseClipseGroup/RiseClipseValidator_CGMES-2-4-15.git</connection>
<developerConnection>scm:git:git@gitlab.centralesupelec.fr:RiseClipseGroup/RiseClipseValidator_CGMES-2-4-15.git</developerConnection>
<tag>HEAD</tag>
</scm>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment