From d1b7a86128d527a3268a6be1fa0308e040d67359 Mon Sep 17 00:00:00 2001 From: Chrissi <christopher@hbsc-werner.de> Date: Sun, 4 Aug 2019 13:38:14 +0200 Subject: [PATCH] remove warnings as unused imports and so one --- .../grammar/KeepCalculatedExpression.java | 1 - .../parser/legacy/DefaultModelJoinParser.java | 1 - .../representation/util/Functional.java | 1 - .../ModelJoinCreation.java | 31 +------------------ .../representation/writer/TestedModels.java | 6 ---- 5 files changed, 1 insertion(+), 39 deletions(-) diff --git a/src/main/java/org/rosi_project/model_sync/model_join/representation/grammar/KeepCalculatedExpression.java b/src/main/java/org/rosi_project/model_sync/model_join/representation/grammar/KeepCalculatedExpression.java index 19a1a22..c8bfa5f 100644 --- a/src/main/java/org/rosi_project/model_sync/model_join/representation/grammar/KeepCalculatedExpression.java +++ b/src/main/java/org/rosi_project/model_sync/model_join/representation/grammar/KeepCalculatedExpression.java @@ -2,7 +2,6 @@ package org.rosi_project.model_sync.model_join.representation.grammar; import java.util.Objects; import javax.annotation.Nonnull; -import org.rosi_project.model_sync.model_join.representation.core.AttributePath; import org.rosi_project.model_sync.model_join.representation.core.OCLStatement; import org.rosi_project.model_sync.model_join.representation.core.TypedAttributePath; diff --git a/src/main/java/org/rosi_project/model_sync/model_join/representation/parser/legacy/DefaultModelJoinParser.java b/src/main/java/org/rosi_project/model_sync/model_join/representation/parser/legacy/DefaultModelJoinParser.java index 25f4b9c..7f5c8dc 100644 --- a/src/main/java/org/rosi_project/model_sync/model_join/representation/parser/legacy/DefaultModelJoinParser.java +++ b/src/main/java/org/rosi_project/model_sync/model_join/representation/parser/legacy/DefaultModelJoinParser.java @@ -9,7 +9,6 @@ import java.util.Optional; import java.util.regex.Pattern; import javax.annotation.Nonnull; import org.rosi_project.model_sync.model_join.representation.grammar.ModelJoinExpression; -import org.rosi_project.model_sync.model_join.representation.parser.ModelJoinParser; import org.rosi_project.model_sync.model_join.representation.parser.ModelJoinParsingException; import org.rosi_project.model_sync.model_join.representation.util.ModelJoinBuilder; diff --git a/src/main/java/org/rosi_project/model_sync/model_join/representation/util/Functional.java b/src/main/java/org/rosi_project/model_sync/model_join/representation/util/Functional.java index 853ee96..b90cb97 100644 --- a/src/main/java/org/rosi_project/model_sync/model_join/representation/util/Functional.java +++ b/src/main/java/org/rosi_project/model_sync/model_join/representation/util/Functional.java @@ -6,7 +6,6 @@ import java.util.Optional; import java.util.function.Function; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import javax.swing.text.html.Option; /** * Contains a number of useful classes to mimic behaviour from functional programming languages in diff --git a/src/main/java/org/rosi_project/model_sync/modelrepresentation/ModelJoinCreation.java b/src/main/java/org/rosi_project/model_sync/modelrepresentation/ModelJoinCreation.java index 0e6df61..42a359a 100644 --- a/src/main/java/org/rosi_project/model_sync/modelrepresentation/ModelJoinCreation.java +++ b/src/main/java/org/rosi_project/model_sync/modelrepresentation/ModelJoinCreation.java @@ -3,7 +3,6 @@ package org.rosi_project.model_sync.modelrepresentation; import static org.rosi_project.model_sync.model_join.representation.util.ModelJoinBuilder.attributes; import static org.rosi_project.model_sync.model_join.representation.util.ModelJoinBuilder.outgoing; import static org.rosi_project.model_sync.model_join.representation.util.ModelJoinBuilder.supertype; -import static org.rosi_project.model_sync.model_join.representation.util.ModelJoinBuilder.thetaJoin; import static org.rosi_project.model_sync.model_join.representation.util.ModelJoinBuilder.naturalJoin; import java.io.File; @@ -16,38 +15,11 @@ import org.rosi_project.model_sync.model_join.representation.writer.*; public class ModelJoinCreation { - public static void main(String[] args) { - /*ClassResource person = ClassResource.fromQualifiedName("contact.Person"); - ClassResource employee = ClassResource.fromQualifiedName("company.Employee"); - AttributePath dateOfBirth = AttributePath.from(person, "dateOfBirth"); - - ModelJoinExpression mj = ModelJoinBuilder.createNewModelJoin() - .add(JoinFactory.createNew() - .natural() - .join(person) - .with(employee) - .as(ClassResource.fromQualifiedName("unified.Person")) - .keep(KeepAttributesExpression - .keepAttributes(dateOfBirth)) - .done() - ).build(); - System.out.println(mj); - for (JoinExpression j: mj.getJoins()) { - System.out.println(j); - for (KeepExpression k: j.getKeeps()) { - System.out.println(k); - } - }*/ - + public static void main(String[] args) { ClassResource library = ClassResource.from("lib", "Library"); ClassResource employee = ClassResource.from("lib", "Employee"); ClassResource person = ClassResource.from("lib", "Person"); - //ClassResource.fromQualifiedName("lib.Library"); - - //ClassResource jointargetMovie = ClassResource.from("jointarget", "Movie"); - //ClassResource jointargetVote = ClassResource.from("jointarget", "Vote"); - //ClassResource jointargetMediaItem = ClassResource.from("jointarget", "MediaItem"); AttributePath libraryName = AttributePath.from(library, "name"); AttributePath libraryEmployees = AttributePath.from(library, "employees"); @@ -118,7 +90,6 @@ public class ModelJoinCreation { File fileComplete = new File("libraryComplete.modeljoin"); File fileSimple = new File("librarySimple.modeljoin"); File fileManager = new File("manager.modeljoin"); - //registerCreatedFile(outputFile); FileBasedModelJoinWriter writerComplete = new FileBasedModelJoinWriter(fileComplete); writerComplete.write(mjComplete); diff --git a/src/test/java/org/rosi_project/model_sync/model_join/representation/writer/TestedModels.java b/src/test/java/org/rosi_project/model_sync/model_join/representation/writer/TestedModels.java index ad0da37..6505054 100644 --- a/src/test/java/org/rosi_project/model_sync/model_join/representation/writer/TestedModels.java +++ b/src/test/java/org/rosi_project/model_sync/model_join/representation/writer/TestedModels.java @@ -4,15 +4,9 @@ import static org.rosi_project.model_sync.model_join.representation.util.ModelJo import static org.rosi_project.model_sync.model_join.representation.util.ModelJoinBuilder.outgoing; import static org.rosi_project.model_sync.model_join.representation.util.ModelJoinBuilder.supertype; import static org.rosi_project.model_sync.model_join.representation.util.ModelJoinBuilder.thetaJoin; -import static org.rosi_project.model_sync.model_join.representation.util.ModelJoinBuilder.naturalJoin; - -import org.rosi_project.model_sync.model_join.representation.grammar.KeepAttributesExpression; -import org.rosi_project.model_sync.model_join.representation.grammar.KeepExpression; import org.rosi_project.model_sync.model_join.representation.core.AttributePath; import org.rosi_project.model_sync.model_join.representation.core.ClassResource; import org.rosi_project.model_sync.model_join.representation.grammar.ModelJoinExpression; -import org.rosi_project.model_sync.model_join.representation.util.JoinFactory.ThetaJoinBuilder; -import org.rosi_project.model_sync.model_join.representation.util.JoinFactory; import org.rosi_project.model_sync.model_join.representation.util.ModelJoinBuilder; class TestedModels { -- GitLab