Skip to content

Commit

Permalink
Temporary Revert to fix pipeline
Browse files Browse the repository at this point in the history
  • Loading branch information
SE-FDr committed Apr 17, 2024
1 parent 9363d3f commit fa77e51
Show file tree
Hide file tree
Showing 10 changed files with 39 additions and 19 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.monticore.od4report.prettyprinter;/* (c) https://github.com/MontiCore/monticore */
package de.monticore;/* (c) https://github.com/MontiCore/monticore */

import de.monticore.io.paths.MCPath;
import de.monticore.od4report.OD4ReportMill;
Expand Down Expand Up @@ -210,4 +210,4 @@ public static void main(String[] args) {
ODPlantUMLTool tool = new ODPlantUMLTool();
tool.run(args);
}
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package de.monticore.od4report.prettyprinter;
package de.monticore;

import de.monticore.od4report._parser.OD4ReportParser;
import de.monticore.od4report.prettyprinter.PlantUMLODFullPrettyPrinter;
import de.monticore.odbasis._ast.ASTODArtifact;

import java.io.IOException;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.monticore.odbasis.prettyprinter;
package de.monticore;

import de.monticore.expressions.expressionsbasis._ast.ASTLiteralExpression;
import de.monticore.expressions.expressionsbasis._ast.ASTNameExpression;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
package de.monticore.od4report.prettyprinter;
package de.monticore;

import de.monticore.dateliterals._prettyprint.DateLiteralsPrettyPrinter;
import de.monticore.literals.mccommonliterals._prettyprint.MCCommonLiteralsPrettyPrinter;
import de.monticore.od4report.OD4ReportMill;
import de.monticore.od4report._visitor.OD4ReportTraverser;
import de.monticore.od4report.prettyprinter.PlantUMLODReportPrettyPrinter;
import de.monticore.odbasis._ast.ASTODArtifact;
import de.monticore.odbasis.prettyprinter.PlantUMLODBasisPrettyPrinter;
import de.monticore.odlink.prettyprinter.PlantUMLODLinkPrettyPrinter;
import de.monticore.prettyprint.IndentPrinter;

/**
Expand Down Expand Up @@ -54,4 +51,4 @@ public String prettyprint(ASTODArtifact a) {
a.accept(traverser);
return printer.getContent();
}
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.monticore.odlink.prettyprinter;
package de.monticore;

import de.monticore.odbasis._visitor.ODBasisHandler;
import de.monticore.odbasis._visitor.ODBasisVisitor2;
Expand Down Expand Up @@ -91,4 +91,4 @@ public void handle(ASTODLinkRightSide node) {
printer.print(" \"" + node.getRole() + "\" ");
}
}
}
}
16 changes: 16 additions & 0 deletions src/main/java/de/monticore/PlantUMLODObjectTypePrettyPrinter.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package de.monticore;

import de.monticore.types.mcbasictypes._visitor.MCBasicTypesHandler;
import de.monticore.types.mcbasictypes._visitor.MCBasicTypesTraverser;

public class PlantUMLODObjectTypePrettyPrinter implements MCBasicTypesHandler {
@Override
public MCBasicTypesTraverser getTraverser() {
return null;
}

@Override
public void setTraverser(MCBasicTypesTraverser traverser) {

}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.monticore.od4report.prettyprinter;
package de.monticore;

import de.monticore.od4report._ast.ASTODName;
import de.monticore.od4report._visitor.OD4ReportHandler;
Expand Down Expand Up @@ -39,4 +39,4 @@ public void setTraverser(OD4ReportTraverser traverser) {
public void visit(ASTODName node) {
printer.print(node.isPresentName() ? node.getName() : node.getODSpecialName());
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ are generally typed (here e.g. `A`, `B`), links can be explicitly defined quite
MontiCore's class diagrams. Further extensions e.g. through language composition allow
various forms and uses object diagrams.

![*Figure 1:* The graphical syntax of an example OD.](../../../../../../../doc/pics/ODExample4DiagramTrafo.png)
![*Figure 1:* The graphical syntax of an example OD.](../../../../../doc/pics/ODExample4DiagramTrafo.png)
<br><b>Figure 1:</b> The OD ```Example``` in graphical syntax.


Expand Down Expand Up @@ -75,7 +75,7 @@ foo--> "blub" bar
2. Detailed Implementation can be found here: [generateImage](ODPlantUMLTool.java)


![*Figure 2:* Generation of graphical OD from PlantUML text.](../../../../../../../doc/pics/GeneratePlantUMLDiagram.png)
![*Figure 2:* Generation of graphical OD from PlantUML text.](../../../../../doc/pics/GeneratePlantUMLDiagram.png)
<br><b>Figure 2:</b> Generation of Object Diagram from PlantUML Model.


Expand Down
13 changes: 11 additions & 2 deletions src/main/java/de/monticore/od2cd/CompositionPrinter.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ public String create(ASTMCType type) {

}

return res;
return res; // pkg . Manager . builder
}

public String read() {
return "// NA";
return "//fooooo";
}

public String write(ASTMCType type) {
Expand Down Expand Up @@ -67,4 +67,13 @@ public String update(String attribute, String value) {
return ".set" + attribute.substring(0,1).toUpperCase() + attribute.substring(1) + "(" + value + ")";
}

// public String genType(ASTMCType type) {
// OD4DevelopmentGlobalScope gs = OD4DevelopmentMill.globalScope();
//
// if (gs.getSubScopes().size() == 1) {
//
// }
// return examples.Mill.${printInfo?uncapFirst}Builder()
// }

}
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package de.monticore;

import de.monticore.od4report._parser.OD4ReportParser;
import de.monticore.od4report.prettyprinter.PlantUMLODFullPrettyPrinter;
import de.monticore.odbasis._ast.ASTODArtifact;
import de.se_rwth.commons.logging.Log;
import org.junit.BeforeClass;
Expand Down

0 comments on commit fa77e51

Please sign in to comment.