Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
pnml-relast
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
JastAdd
pnml
pnml-relast
Commits
5005d150
Commit
5005d150
authored
5 years ago
by
Johannes Mey
Browse files
Options
Downloads
Patches
Plain Diff
use correct logging
parent
68cb9e07
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
build.gradle
+4
-5
4 additions, 5 deletions
build.gradle
src/main/java/de/tudresden/inf/st/pnml/Main.java
+13
-9
13 additions, 9 deletions
src/main/java/de/tudresden/inf/st/pnml/Main.java
with
17 additions
and
14 deletions
build.gradle
+
4
−
5
View file @
5005d150
...
...
@@ -27,8 +27,8 @@ jar.manifest.attributes('Main-Class': 'de.tudresden.inf.st.pnml.Main')
dependencies
{
implementation
group:
'com.fasterxml.jackson.core'
,
name:
'jackson-databind'
,
version:
"${jackson_version}"
implementation
group:
'net.sf.beaver'
,
name:
'beaver-rt'
,
version:
'0.9.11'
implementation
group:
'org.
apache.logging.log
4j'
,
name:
'
log
4j-api'
,
version:
'
2.13.1
'
implementation
group:
'org.apache.logging.log4j'
,
name:
'log4j-
core
'
,
version:
'2.13.
1
'
implementation
group:
'org.
slf
4j'
,
name:
'
slf
4j-api'
,
version:
'
1.7.30
'
implementation
group:
'org.apache.logging.log4j'
,
name:
'log4j-
slf4j-impl
'
,
version:
'2.13.
2
'
// pnml lib
implementation
group:
'org.eclipse.emf'
,
name:
'org.eclipse.emf.ecore'
,
version:
'2.12.0'
...
...
@@ -37,11 +37,9 @@ dependencies {
implementation
group:
'org.eclipse.emf'
,
name:
'org.eclipse.emf.mwe.core'
,
version:
'1.3.13'
implementation
group:
'fr.lip6.pnml'
,
name:
'fr.lip6.pnml.framework.ptnet'
,
version:
'2.2.12'
implementation
group:
'fr.lip6.pnml'
,
name:
'fr.lip6.pnml.framework.utils'
,
version:
'2.2.12'
implementation
group:
'org.slf4j'
,
name:
'slf4j-api'
,
version:
'1.7.30'
implementation
group:
'org.apache.ws.commons.axiom'
,
name:
'axiom-api'
,
version:
'1.2.22'
implementation
group:
'org.apache.ws.commons.axiom'
,
name:
'axiom-impl'
,
version:
'1.2.22'
implementation
group:
'com.thaiopensource'
,
name:
'jing'
,
version:
'20091111'
implementation
group:
'org.slf4j'
,
name:
'slf4j-log4j12'
,
version:
'1.7.30'
jastadd2
"org.jastadd:jastadd:2.3.4"
}
...
...
@@ -54,6 +52,7 @@ run {
// Generated files
def
ecoreFile
=
"./src/main/resources/placeTransition.ecore"
def
relastAspect
=
"./src/gen/jastadd/placeTransition.ecore.jadd"
def
relastFile
=
"./src/gen/jastadd/placeTransition.relast"
// First phase: Ecore -> RelAst
...
...
@@ -70,7 +69,7 @@ task ecoreToRelast(type: JavaExec) {
args
"libs/ecore2relast-0.1.jar"
,
ecoreFile
,
relastFile
inputs
.
files
file
(
ecoreFile
)
outputs
.
files
file
(
relastFile
)
outputs
.
files
file
(
relastFile
)
,
file
(
relastAspect
)
}
// Second phase: RelAst -> JastAdd
...
...
This diff is collapsed.
Click to expand it.
src/main/java/de/tudresden/inf/st/pnml/Main.java
+
13
−
9
View file @
5005d150
...
...
@@ -8,8 +8,8 @@ import fr.lip6.move.pnml.framework.utils.PNMLUtils;
import
fr.lip6.move.pnml.framework.utils.exception.ImportException
;
import
fr.lip6.move.pnml.framework.utils.exception.InvalidIDException
;
import
fr.lip6.move.pnml.ptnet.hlapi.PetriNetDocHLAPI
;
import
org.
apache.log
4j.Log
Mana
ger
;
import
org.
apache.log
4j.Logger
;
import
org.
slf
4j.Logger
;
import
org.
slf
4j.Logger
Factory
;
import
java.nio.file.Path
;
import
java.nio.file.Paths
;
...
...
@@ -18,7 +18,7 @@ import java.util.List;
public
class
Main
{
private
static
Logger
logger
=
Log
Manager
.
getLogger
(
Main
.
class
);
private
static
final
Logger
logger
=
Log
gerFactory
.
getLogger
(
Main
.
class
);
public
static
void
main
(
String
[]
args
)
{
...
...
@@ -31,14 +31,14 @@ public class Main {
try
{
document
=
PNMLUtils
.
importPnmlDocument
(
file
.
toFile
(),
false
);
System
.
out
.
println
(
document
.
toPNML
());
logger
.
info
(
document
.
toPNML
());
}
catch
(
ImportException
|
InvalidIDException
e
)
{
logger
.
error
(
"Unable to import PNML document from file '
"
+
fileName
+
"'"
);
logger
.
error
(
"Unable to import PNML document from file '
{}'"
,
fileName
);
System
.
exit
(-
1
);
}
System
.
out
.
println
(
"Imported document workspace ID:
"
+
ModelRepository
.
getInstance
().
getCurrentDocWSId
());
logger
.
info
(
"Imported document workspace ID:
{}"
,
ModelRepository
.
getInstance
().
getCurrentDocWSId
());
PNType
type
=
PNMLUtils
.
determinePNType
(
document
);
switch
(
type
)
{
...
...
@@ -49,18 +49,22 @@ public class Main {
List
<
PetriNet
>
petriNets
=
new
ArrayList
<>();
for
(
fr
.
lip6
.
move
.
pnml
.
ptnet
.
PetriNet
pmnlNet
:
ptDoc
.
getNets
())
{
PnmlParser
parser
=
null
;
PnmlParser
parser
;
try
{
parser
=
new
PnmlParser
(
pmnlNet
);
petriNets
.
add
(
parser
.
getPetriNet
());
}
catch
(
PnmlParseException
e
)
{
e
.
printStackTrace
(
);
logger
.
error
(
"Parsing the Petri net using the PNML framawork failed."
,
e
);
}
}
break
;
case
COREMODEL:
case
SYMNET:
case
HLPN:
case
PTHLPN:
default
:
logger
.
error
(
"Petri net is of unsupported type
"
+
type
.
getLiteral
());
logger
.
error
(
"Petri net is of unsupported type
{}."
,
type
.
getLiteral
());
System
.
exit
(-
1
);
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment