Skip to content

Commit f99b275

Browse files
seidewitzseidewitz
committed
ST6RI-886 Reorganized package structure library function impl classes.
Created Java packages under corresponding to Kernel Function Library packages.
1 parent 433a859 commit f99b275

55 files changed

Lines changed: 86 additions & 72 deletions

Some content is hidden

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

‎org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/LibraryFunctionFactory.java‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@
2121

2222
package org.omg.sysml.execution.expressions;
2323

24-
import org.omg.sysml.execution.expressions.functions.*;
24+
import org.omg.sysml.execution.expressions.functions.numerical.*;
25+
import org.omg.sysml.execution.expressions.functions.sequence.*;
26+
import org.omg.sysml.execution.expressions.functions.string.*;
2527

2628
public class LibraryFunctionFactory extends org.omg.sysml.expressions.ModelLevelLibraryFunctionFactory {
2729

@@ -31,15 +33,18 @@ public class LibraryFunctionFactory extends org.omg.sysml.expressions.ModelLevel
3133
protected void initializeFunctionMap() {
3234
super.initializeFunctionMap();
3335

36+
// NumericalFunctions
37+
put(new SumFunction());
38+
put(new ProdFunction());
39+
40+
// SequenceFunctions
3441
put(new SizeFunction());
3542
put(new IsEmptyFunction());
3643
put(new NotEmptyFunction());
3744
put(new IncludesFunction());
3845
put(new ExcludesFunction());
3946

40-
put(new SumFunction());
41-
put(new ProdFunction());
42-
47+
// StringFunctions
4348
put(new StringLengthFunction());
4449
put(new StringSubstringFunction());
4550
}

org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/functions/NumericalFunction.java renamed to org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/functions/numerical/NumericalFunction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*
2020
*******************************************************************************/
2121

22-
package org.omg.sysml.execution.expressions.functions;
22+
package org.omg.sysml.execution.expressions.functions.numerical;
2323

2424
import org.omg.sysml.expressions.functions.LibraryFunction;
2525

org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/functions/ProdFunction.java renamed to org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/functions/numerical/ProdFunction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*
2020
*******************************************************************************/
2121

22-
package org.omg.sysml.execution.expressions.functions;
22+
package org.omg.sysml.execution.expressions.functions.numerical;
2323

2424
import org.eclipse.emf.common.util.EList;
2525
import org.omg.sysml.expressions.ModelLevelExpressionEvaluator;

org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/functions/SumFunction.java renamed to org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/functions/numerical/SumFunction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*
2020
*******************************************************************************/
2121

22-
package org.omg.sysml.execution.expressions.functions;
22+
package org.omg.sysml.execution.expressions.functions.numerical;
2323

2424
import org.eclipse.emf.common.util.EList;
2525
import org.omg.sysml.expressions.ModelLevelExpressionEvaluator;

org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/functions/ExcludesFunction.java renamed to org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/functions/sequence/ExcludesFunction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* @license LGPL-3.0-or-later <http://spdx.org/licenses/LGPL-3.0-or-later>
1919
*
2020
*******************************************************************************/
21-
package org.omg.sysml.execution.expressions.functions;
21+
package org.omg.sysml.execution.expressions.functions.sequence;
2222

2323
import org.eclipse.emf.common.util.EList;
2424
import org.omg.sysml.expressions.ModelLevelExpressionEvaluator;

org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/functions/IncludesFunction.java renamed to org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/functions/sequence/IncludesFunction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* @license LGPL-3.0-or-later <http://spdx.org/licenses/LGPL-3.0-or-later>
1919
*
2020
*******************************************************************************/
21-
package org.omg.sysml.execution.expressions.functions;
21+
package org.omg.sysml.execution.expressions.functions.sequence;
2222

2323
import org.eclipse.emf.common.util.EList;
2424
import org.omg.sysml.expressions.ModelLevelExpressionEvaluator;

org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/functions/IsEmptyFunction.java renamed to org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/functions/sequence/IsEmptyFunction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* @license LGPL-3.0-or-later <http://spdx.org/licenses/LGPL-3.0-or-later>
1919
*
2020
*******************************************************************************/
21-
package org.omg.sysml.execution.expressions.functions;
21+
package org.omg.sysml.execution.expressions.functions.sequence;
2222

2323
import org.eclipse.emf.common.util.EList;
2424
import org.omg.sysml.expressions.ModelLevelExpressionEvaluator;

org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/functions/NotEmptyFunction.java renamed to org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/functions/sequence/NotEmptyFunction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* @license LGPL-3.0-or-later <http://spdx.org/licenses/LGPL-3.0-or-later>
1919
*
2020
*******************************************************************************/
21-
package org.omg.sysml.execution.expressions.functions;
21+
package org.omg.sysml.execution.expressions.functions.sequence;
2222

2323
import org.eclipse.emf.common.util.EList;
2424
import org.omg.sysml.expressions.ModelLevelExpressionEvaluator;

org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/functions/SequenceFunction.java renamed to org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/functions/sequence/SequenceFunction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*
2020
*******************************************************************************/
2121

22-
package org.omg.sysml.execution.expressions.functions;
22+
package org.omg.sysml.execution.expressions.functions.sequence;
2323

2424
import org.omg.sysml.expressions.functions.LibraryFunction;
2525

org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/functions/SizeFunction.java renamed to org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/functions/sequence/SizeFunction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* @license LGPL-3.0-or-later <http://spdx.org/licenses/LGPL-3.0-or-later>
1919
*
2020
*******************************************************************************/
21-
package org.omg.sysml.execution.expressions.functions;
21+
package org.omg.sysml.execution.expressions.functions.sequence;
2222

2323
import org.eclipse.emf.common.util.EList;
2424
import org.omg.sysml.expressions.ModelLevelExpressionEvaluator;

0 commit comments

Comments
 (0)