From c2c89557fc41c27652f8b14aa2bf71458821f057 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Euzenat?= <Jerome.Euzenat@inria.fr>
Date: Wed, 11 Jan 2017 12:11:11 +0000
Subject: [PATCH] - Fixed a bug in test generation without URI (gen) - Added
Exceptions in test generation
---
html/relnotes.html | 1 +
.../inrialpes/exmo/align/gen/Alterator.java | 5 +++--
.../exmo/align/gen/AlteratorFactory.java | 6 ++++--
.../exmo/align/gen/TestGenerator.java | 11 ++++++-----
src/fr/inrialpes/exmo/align/gen/TestSet.java | 19 +++++++++----------
.../exmo/align/gen/alt/AddClassLevel.java | 4 ++--
.../exmo/align/gen/alt/AddClasses.java | 4 ++--
.../exmo/align/gen/alt/AddProperties.java | 4 ++--
.../exmo/align/gen/alt/BasicAlterator.java | 4 ++--
.../exmo/align/gen/alt/EmptyModification.java | 13 +++++++++++--
.../exmo/align/gen/alt/FlattenLevel.java | 4 ++--
.../exmo/align/gen/alt/RemoveClassLevel.java | 4 ++--
.../exmo/align/gen/alt/RemoveClasses.java | 4 ++--
.../exmo/align/gen/alt/RemoveComments.java | 4 ++--
.../exmo/align/gen/alt/RemoveIndividuals.java | 4 ++--
.../exmo/align/gen/alt/RemoveProperties.java | 4 ++--
.../align/gen/alt/RemoveRestrictions.java | 4 ++--
.../exmo/align/gen/alt/RenameClasses.java | 4 ++--
.../exmo/align/gen/alt/RenameProperties.java | 4 ++--
.../exmo/align/gen/alt/RenameThings.java | 6 +++++-
.../exmo/align/gen/alt/SuppressHierarchy.java | 4 ++--
21 files changed, 67 insertions(+), 50 deletions(-)
diff --git a/html/relnotes.html b/html/relnotes.html
index c3f84731..219c9e31 100644
--- a/html/relnotes.html
+++ b/html/relnotes.html
@@ -63,6 +63,7 @@ with a warning:
<li><span style="color: red;">Suppressed</span> empty constructor in <tt>DBServiceImpl</tt> (serv)</li>
<li>Fixed a bug in <tt>SQLCache</tt> loading from database which prevented to reload EDOAL alignments (serv)</li>
<li>Fixed a problem with Jade when running a server with no X server running (serv)</li>
+<li>Fixed a bug in test generation without URI (gen)</li>
<li>Moved all shell examples from csh to bash (html)</li>
<li>Clarified EDOAL documentation (html)</li>
<li>Several documentation fixes --alignwn, rest-- (html)</li>
diff --git a/src/fr/inrialpes/exmo/align/gen/Alterator.java b/src/fr/inrialpes/exmo/align/gen/Alterator.java
index d357f59a..b5360c5c 100644
--- a/src/fr/inrialpes/exmo/align/gen/Alterator.java
+++ b/src/fr/inrialpes/exmo/align/gen/Alterator.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) 2011, 2015 INRIA
+ * Copyright (C) INRIA, 2011, 2015, 2017
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -24,6 +24,7 @@ package fr.inrialpes.exmo.align.gen;
import java.util.Properties;
import org.semanticweb.owl.align.Alignment;
+import org.semanticweb.owl.align.AlignmentException;
import org.apache.jena.ontology.OntModel;
@@ -61,7 +62,7 @@ public interface Alterator {
* @param params: the alteration to be performed
* @return the Alterator object with alterations performed
*/
- public Alterator modify( Properties params );
+ public Alterator modify( Properties params ) throws AlignmentException;
// Temporary
/**
diff --git a/src/fr/inrialpes/exmo/align/gen/AlteratorFactory.java b/src/fr/inrialpes/exmo/align/gen/AlteratorFactory.java
index b10fb356..3dbda310 100644
--- a/src/fr/inrialpes/exmo/align/gen/AlteratorFactory.java
+++ b/src/fr/inrialpes/exmo/align/gen/AlteratorFactory.java
@@ -1,7 +1,7 @@
/**
* $Id$
*
- * Copyright (C) INRIA, 2011, 2013-2015
+ * Copyright (C) INRIA, 2011, 2013-2015, 2017
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -29,6 +29,8 @@ import org.slf4j.LoggerFactory;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Constructor;
+import org.semanticweb.owl.align.AlignmentException;
+
public class AlteratorFactory {
final static Logger logger = LoggerFactory.getLogger( AlteratorFactory.class );
@@ -93,7 +95,7 @@ public class AlteratorFactory {
// I should add a run primitive
// which executes all the parameters in the given order
- public static Alterator cascadeAlterators( Alterator init, Properties params ) {
+ public static Alterator cascadeAlterators( Alterator init, Properties params ) throws AlignmentException {
Alterator modifier = init;
// JE: Of course, this could be improved (at least be rendered generic)
if ( params.getProperty( ParametersIds.REMOVE_CLASSES ) != null ) {
diff --git a/src/fr/inrialpes/exmo/align/gen/TestGenerator.java b/src/fr/inrialpes/exmo/align/gen/TestGenerator.java
index 071a3ba8..87bc874b 100644
--- a/src/fr/inrialpes/exmo/align/gen/TestGenerator.java
+++ b/src/fr/inrialpes/exmo/align/gen/TestGenerator.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) 2011-2013, 2015 INRIA
+ * Copyright (C) INRIA, 2011-2013, 2015, 2017
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -35,6 +35,7 @@ import fr.inrialpes.exmo.align.impl.URIAlignment;
import fr.inrialpes.exmo.align.impl.renderer.RDFRendererVisitor;
import org.semanticweb.owl.align.Alignment;
+import org.semanticweb.owl.align.AlignmentException;
import org.semanticweb.owl.align.AlignmentVisitor;
//Java classes
@@ -181,7 +182,7 @@ public class TestGenerator {
* @param testNb: name (number) of the test to be generated
* @return the protoalignment expressed as properties
*/
- public Properties incrementModifyOntology( String pKey, String pVal, String suffix, String prevTest, Properties al, String testNb ) {
+ public Properties incrementModifyOntology( String pKey, String pVal, String suffix, String prevTest, Properties al, String testNb ) throws AlignmentException {
Properties p = new Properties();
p.setProperty( pKey, pVal );
String prevDirName = directoryName( prevTest, suffix );
@@ -198,7 +199,7 @@ public class TestGenerator {
* @param params: parameters describing the test alterations
* @return the protoalignment expressed as properties
*/
- public Properties incrementModifyOntology( String prevTestDir, Properties al, String testDir, Properties params ) {
+ public Properties incrementModifyOntology( String prevTestDir, Properties al, String testDir, Properties params ) throws AlignmentException {
return modifyOntology( dirprefix+"/"+prevTestDir+"/"+ontoname, al, testDir, params );
}
@@ -212,7 +213,7 @@ public class TestGenerator {
* @param params: parameters describing the test alterations
* @return the protoalignment expressed as properties
*/
- public Properties modifyOntology( String file, Properties al, String dirName, Properties params) {
+ public Properties modifyOntology( String file, Properties al, String dirName, Properties params) throws AlignmentException {
logger.trace( "Source: {}; Target {}", file, dirName );
//set the TestGenerator ontology
OntModel onto = loadOntology( file );
@@ -230,7 +231,7 @@ public class TestGenerator {
// ******************************************************* GENERATOR
//generate the alignment
- public Alterator generate( OntModel onto, Properties params, Properties initalign ) {
+ public Alterator generate( OntModel onto, Properties params, Properties initalign ) throws AlignmentException {
logger.debug( "[-------------------------------------------------]" );
logger.debug( "{} / {} / {} / {}", urlprefix, dirprefix, ontoname, alignname );
// Load the ontology
diff --git a/src/fr/inrialpes/exmo/align/gen/TestSet.java b/src/fr/inrialpes/exmo/align/gen/TestSet.java
index 5ea4d443..d6dd0030 100644
--- a/src/fr/inrialpes/exmo/align/gen/TestSet.java
+++ b/src/fr/inrialpes/exmo/align/gen/TestSet.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) 2011-2014, INRIA
+ * Copyright (C) INRIA 2011-2014, 2017
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -45,6 +45,8 @@ import java.util.HashSet;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.semanticweb.owl.align.AlignmentException;
+
public abstract class TestSet {
final static Logger logger = LoggerFactory.getLogger( TestSet.class );
@@ -95,7 +97,7 @@ public abstract class TestSet {
// ----------------------------------------------------------
// Generates the test set
- public void generate( Properties params ) {
+ public void generate( Properties params ) throws AlignmentException {
// Generator parameters... are these OK?
initOntoFile = params.getProperty( "filename" ); // If no filename error
if ( params.getProperty( "urlprefix" ) != null ) generator.setURLPrefix( params.getProperty( "urlprefix" ) );
@@ -114,22 +116,19 @@ public abstract class TestSet {
// Print it
// printTestHierarchy( root, 0 );
if ( params.getProperty( "alignname" ) != null ) generator.setAlignFilename( params.getProperty( "alignname" ) );
- // Generate all tests
- startTestGeneration();
- }
-
- // Recursively generate tests
- // All this is really tied to
- public void startTestGeneration() {
+ // Recursively generate all tests
+ // All this is really tied to
Properties parameters = new Properties();
parameters.setProperty( "copy101", "" );
+ if ( params.getProperty( "urlprefix" ) != null )
+ parameters.setProperty( "urlprefix", params.getProperty( "urlprefix" ) );
Properties newalign = generator.modifyOntology( initOntoFile, (Properties)null, root.name, parameters );
for ( TestCase sub : root.subTests ) {
generateTest( sub, newalign );
}
}
- public void generateTest( TestCase c, Properties align ) {
+ public void generateTest( TestCase c, Properties align ) throws AlignmentException {
Properties newalign;
if ( continuous ) {
newalign = generator.incrementModifyOntology( c.father.name, (Properties)align.clone(), c.name, c.parameters );
diff --git a/src/fr/inrialpes/exmo/align/gen/alt/AddClassLevel.java b/src/fr/inrialpes/exmo/align/gen/alt/AddClassLevel.java
index 42507e0f..838d3648 100755
--- a/src/fr/inrialpes/exmo/align/gen/alt/AddClassLevel.java
+++ b/src/fr/inrialpes/exmo/align/gen/alt/AddClassLevel.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) 2011-2013, 2015 INRIA
+ * Copyright (C) INRIA 2011-2013, 2015, 2017
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -37,7 +37,7 @@ public class AddClassLevel extends BasicAlterator {
final static Logger logger = LoggerFactory.getLogger( AddClassLevel.class );
public AddClassLevel( Alterator om ) {
- initModel( om );
+ super( om );
};
public Alterator modify( Properties params ) {
diff --git a/src/fr/inrialpes/exmo/align/gen/alt/AddClasses.java b/src/fr/inrialpes/exmo/align/gen/alt/AddClasses.java
index 50d082ff..e5ab57c8 100755
--- a/src/fr/inrialpes/exmo/align/gen/alt/AddClasses.java
+++ b/src/fr/inrialpes/exmo/align/gen/alt/AddClasses.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2011, 2015
+ * Copyright (C) INRIA, 2011, 2015, 2017
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -33,7 +33,7 @@ import fr.inrialpes.exmo.align.gen.ParametersIds;
public class AddClasses extends BasicAlterator {
public AddClasses( Alterator om ) {
- initModel( om );
+ super( om );
};
public Alterator modify( Properties params ) {
diff --git a/src/fr/inrialpes/exmo/align/gen/alt/AddProperties.java b/src/fr/inrialpes/exmo/align/gen/alt/AddProperties.java
index 437c6bef..c7438297 100755
--- a/src/fr/inrialpes/exmo/align/gen/alt/AddProperties.java
+++ b/src/fr/inrialpes/exmo/align/gen/alt/AddProperties.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2011, 2015
+ * Copyright (C) INRIA, 2011, 2015, 2017
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -39,7 +39,7 @@ import fr.inrialpes.exmo.align.gen.ParametersIds;
public class AddProperties extends BasicAlterator {
public AddProperties( Alterator om ) {
- initModel( om );
+ super( om );
};
public Alterator modify( Properties params ) {
diff --git a/src/fr/inrialpes/exmo/align/gen/alt/BasicAlterator.java b/src/fr/inrialpes/exmo/align/gen/alt/BasicAlterator.java
index b34d9f49..d1f720de 100644
--- a/src/fr/inrialpes/exmo/align/gen/alt/BasicAlterator.java
+++ b/src/fr/inrialpes/exmo/align/gen/alt/BasicAlterator.java
@@ -1,7 +1,7 @@
/**
* $Id$
*
- * Copyright (C) INRIA, 2011-2015
+ * Copyright (C) INRIA, 2011-2015, 2017
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -138,7 +138,7 @@ public abstract class BasicAlterator implements Alterator {
}
// abstract
- public abstract Alterator modify( Properties params );
+ public abstract Alterator modify( Properties params ) throws AlignmentException;
// -------------------------
// Accessors
diff --git a/src/fr/inrialpes/exmo/align/gen/alt/EmptyModification.java b/src/fr/inrialpes/exmo/align/gen/alt/EmptyModification.java
index 7cb7835b..0d1ec6c2 100755
--- a/src/fr/inrialpes/exmo/align/gen/alt/EmptyModification.java
+++ b/src/fr/inrialpes/exmo/align/gen/alt/EmptyModification.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2011-2013, 2015
+ * Copyright (C) INRIA, 2011-2013, 2015, 2017
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -39,6 +39,7 @@ import fr.inrialpes.exmo.align.gen.Alterator;
import fr.inrialpes.exmo.align.gen.ParametersIds;
import org.semanticweb.owl.align.Alignment;
+import org.semanticweb.owl.align.AlignmentException;
public class EmptyModification extends BasicAlterator {
final static Logger logger = LoggerFactory.getLogger( EmptyModification.class );
@@ -53,11 +54,19 @@ public class EmptyModification extends BasicAlterator {
// Clearly here setDebug, setNamespace are important
- public Alterator modify( Properties params ) {
+ public Alterator modify( Properties params ) throws AlignmentException {
//logger.trace( "NEW MODIFICATION ------------------------------------" );
relocateSource = ( params.getProperty( "copy101" ) != null );
if ( alignment == null ) {
+ if ( params != null && params.getProperty( "urlprefix" ) != null ) {
+ modifiedOntologyNS = params.getProperty( "urlprefix" );
+ }
+
+ if ( modifiedOntologyNS == null ) {
+ logger.error( "Unknown ontology URI" );
+ throw new AlignmentException( "Unknown ontology URI" );
+ }
initOntologyNS = modifiedOntologyNS;
alignment = new Properties();
diff --git a/src/fr/inrialpes/exmo/align/gen/alt/FlattenLevel.java b/src/fr/inrialpes/exmo/align/gen/alt/FlattenLevel.java
index d0dba44d..94817964 100755
--- a/src/fr/inrialpes/exmo/align/gen/alt/FlattenLevel.java
+++ b/src/fr/inrialpes/exmo/align/gen/alt/FlattenLevel.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2011-2013, 2015
+ * Copyright (C) INRIA, 2011-2013, 2015, 2017
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -40,7 +40,7 @@ public class FlattenLevel extends BasicAlterator {
final static Logger logger = LoggerFactory.getLogger( FlattenLevel.class );
public FlattenLevel( Alterator om ) {
- initModel( om );
+ super( om );
};
public Alterator modify( Properties params ) {
diff --git a/src/fr/inrialpes/exmo/align/gen/alt/RemoveClassLevel.java b/src/fr/inrialpes/exmo/align/gen/alt/RemoveClassLevel.java
index 84838328..679d69f7 100755
--- a/src/fr/inrialpes/exmo/align/gen/alt/RemoveClassLevel.java
+++ b/src/fr/inrialpes/exmo/align/gen/alt/RemoveClassLevel.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2011-2013, 2015
+ * Copyright (C) INRIA, 2011-2013, 2015, 2017
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -38,7 +38,7 @@ public class RemoveClassLevel extends BasicAlterator {
final static Logger logger = LoggerFactory.getLogger( RemoveClassLevel.class );
public RemoveClassLevel( Alterator om ) {
- initModel( om );
+ super( om );
};
public Alterator modify( Properties params ) {
diff --git a/src/fr/inrialpes/exmo/align/gen/alt/RemoveClasses.java b/src/fr/inrialpes/exmo/align/gen/alt/RemoveClasses.java
index fd398cd1..4b4f9149 100755
--- a/src/fr/inrialpes/exmo/align/gen/alt/RemoveClasses.java
+++ b/src/fr/inrialpes/exmo/align/gen/alt/RemoveClasses.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2011-2012, 2015
+ * Copyright (C) INRIA, 2011-2012, 2015, 2017
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -34,7 +34,7 @@ import fr.inrialpes.exmo.align.gen.ParametersIds;
public class RemoveClasses extends BasicAlterator {
public RemoveClasses( Alterator om ) {
- initModel( om );
+ super( om );
};
public Alterator modify( Properties params ) {
diff --git a/src/fr/inrialpes/exmo/align/gen/alt/RemoveComments.java b/src/fr/inrialpes/exmo/align/gen/alt/RemoveComments.java
index a79ba784..975c0442 100755
--- a/src/fr/inrialpes/exmo/align/gen/alt/RemoveComments.java
+++ b/src/fr/inrialpes/exmo/align/gen/alt/RemoveComments.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2011, 2014-2015
+ * Copyright (C) INRIA, 2011, 2014-2015, 2017
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -43,7 +43,7 @@ import fr.inrialpes.exmo.align.gen.ParametersIds;
public class RemoveComments extends BasicAlterator {
public RemoveComments( Alterator om ) {
- initModel( om );
+ super( om );
};
public Alterator modify( Properties params ) {
diff --git a/src/fr/inrialpes/exmo/align/gen/alt/RemoveIndividuals.java b/src/fr/inrialpes/exmo/align/gen/alt/RemoveIndividuals.java
index 26aedbb8..09050657 100755
--- a/src/fr/inrialpes/exmo/align/gen/alt/RemoveIndividuals.java
+++ b/src/fr/inrialpes/exmo/align/gen/alt/RemoveIndividuals.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2011-2012, 2015
+ * Copyright (C) INRIA, 2011-2012, 2015, 2017
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -37,7 +37,7 @@ import fr.inrialpes.exmo.align.gen.ParametersIds;
public class RemoveIndividuals extends BasicAlterator {
public RemoveIndividuals( Alterator om ) {
- initModel( om );
+ super( om );
};
public Alterator modify( Properties params ) {
diff --git a/src/fr/inrialpes/exmo/align/gen/alt/RemoveProperties.java b/src/fr/inrialpes/exmo/align/gen/alt/RemoveProperties.java
index d9eeda13..5ad153bc 100755
--- a/src/fr/inrialpes/exmo/align/gen/alt/RemoveProperties.java
+++ b/src/fr/inrialpes/exmo/align/gen/alt/RemoveProperties.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2011-2015
+ * Copyright (C) INRIA, 2011-2015, 2017
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -48,7 +48,7 @@ public class RemoveProperties extends BasicAlterator {
final static Logger logger = LoggerFactory.getLogger( RemoveProperties.class );
public RemoveProperties( Alterator om ) {
- initModel( om );
+ super( om );
};
public Alterator modify( Properties params ) {
diff --git a/src/fr/inrialpes/exmo/align/gen/alt/RemoveRestrictions.java b/src/fr/inrialpes/exmo/align/gen/alt/RemoveRestrictions.java
index 47b66a9e..413f5e93 100755
--- a/src/fr/inrialpes/exmo/align/gen/alt/RemoveRestrictions.java
+++ b/src/fr/inrialpes/exmo/align/gen/alt/RemoveRestrictions.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2011, 2015
+ * Copyright (C) INRIA, 2011, 2015, 2017
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -34,7 +34,7 @@ import fr.inrialpes.exmo.align.gen.ParametersIds;
public class RemoveRestrictions extends BasicAlterator {
public RemoveRestrictions( Alterator om ) {
- initModel( om );
+ super( om );
};
public Alterator modify( Properties params ) {
diff --git a/src/fr/inrialpes/exmo/align/gen/alt/RenameClasses.java b/src/fr/inrialpes/exmo/align/gen/alt/RenameClasses.java
index 73f8cc54..030efcf2 100755
--- a/src/fr/inrialpes/exmo/align/gen/alt/RenameClasses.java
+++ b/src/fr/inrialpes/exmo/align/gen/alt/RenameClasses.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2011-2012, 2015
+ * Copyright (C) INRIA, 2011-2012, 2015, 2017
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -33,7 +33,7 @@ import fr.inrialpes.exmo.align.gen.ParametersIds;
public class RenameClasses extends RenameThings {
public RenameClasses( Alterator om ) {
- initModel( om );
+ super( om );
};
public Alterator modify( Properties params ) {
diff --git a/src/fr/inrialpes/exmo/align/gen/alt/RenameProperties.java b/src/fr/inrialpes/exmo/align/gen/alt/RenameProperties.java
index 94355153..63f6b03a 100755
--- a/src/fr/inrialpes/exmo/align/gen/alt/RenameProperties.java
+++ b/src/fr/inrialpes/exmo/align/gen/alt/RenameProperties.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) 2011-2012, INRIA
+ * Copyright (C) INRIA, 2011-2012, 2017
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -29,7 +29,7 @@ import fr.inrialpes.exmo.align.gen.ParametersIds;
public class RenameProperties extends RenameThings {
public RenameProperties( Alterator om ) {
- initModel( om );
+ super( om );
};
public Alterator modify( Properties params ) {
diff --git a/src/fr/inrialpes/exmo/align/gen/alt/RenameThings.java b/src/fr/inrialpes/exmo/align/gen/alt/RenameThings.java
index ad53276d..c9f155b8 100755
--- a/src/fr/inrialpes/exmo/align/gen/alt/RenameThings.java
+++ b/src/fr/inrialpes/exmo/align/gen/alt/RenameThings.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2011-2013, 2015
+ * Copyright (C) INRIA, 2011-2013, 2015, 2017
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -67,6 +67,10 @@ public abstract class RenameThings extends BasicAlterator {
// -------------------------
// Label replacement
+ public RenameThings( Alterator om ) {
+ super( om );
+ };
+
//replaces the label of the property
public void replacePropertyLabel( String uri, String newLabel, boolean activeRandomString, boolean activeTranslateString, boolean activeSynonym, int activeStringOperation ) {
OntProperty prop = modifiedModel.getOntProperty( uri );
diff --git a/src/fr/inrialpes/exmo/align/gen/alt/SuppressHierarchy.java b/src/fr/inrialpes/exmo/align/gen/alt/SuppressHierarchy.java
index d8e23064..2549ed36 100755
--- a/src/fr/inrialpes/exmo/align/gen/alt/SuppressHierarchy.java
+++ b/src/fr/inrialpes/exmo/align/gen/alt/SuppressHierarchy.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2011-2012, 2015
+ * Copyright (C) INRIA, 2011-2012, 2015, 2017
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -33,7 +33,7 @@ import fr.inrialpes.exmo.align.gen.ParametersIds;
public class SuppressHierarchy extends BasicAlterator {
public SuppressHierarchy( Alterator om ) {
- initModel( om );
+ super( om );
};
public Alterator modify( Properties params ) {
--
GitLab