From 7512194aaad7f895f9a4e6b4085386fb99048c6f Mon Sep 17 00:00:00 2001 From: Reino Ruusu Date: Mon, 19 Aug 2019 18:39:46 +0300 Subject: [PATCH] Maven pom.xml files for plant3d projects Also added org.simantics.plant3d.product.repository for building plant3d test product. Change-Id: I511a896bde58e25403ad6fec6d855b98822cd29c --- .../feature.xml | 2 +- .../pom.xml | 15 +++++ org.simantics.plant3d.ontology/pom.xml | 17 ++++++ .../simantics/plant3d/ontology/Plant3D.java | 24 ++++---- .../feature.xml | 2 +- org.simantics.plant3d.product.feature/pom.xml | 15 +++++ .../.project | 11 ++++ .../plant3d.product | 0 .../pom.xml | 57 +++++++++++++++++++ org.simantics.plant3d.product/pom.xml | 14 +++++ org.simantics.plant3d/pom.xml | 17 ++++++ .../plant3d/actions/RoutePipeAction.java | 2 +- pom.xml | 12 +++- 13 files changed, 171 insertions(+), 17 deletions(-) create mode 100644 org.simantics.plant3d.modeling.feature/pom.xml create mode 100644 org.simantics.plant3d.ontology/pom.xml create mode 100644 org.simantics.plant3d.product.feature/pom.xml create mode 100644 org.simantics.plant3d.product.repository/.project rename {org.simantics.plant3d.product => org.simantics.plant3d.product.repository}/plant3d.product (100%) create mode 100644 org.simantics.plant3d.product.repository/pom.xml create mode 100644 org.simantics.plant3d.product/pom.xml create mode 100644 org.simantics.plant3d/pom.xml diff --git a/org.simantics.plant3d.modeling.feature/feature.xml b/org.simantics.plant3d.modeling.feature/feature.xml index 96f2034f..7c5588e2 100644 --- a/org.simantics.plant3d.modeling.feature/feature.xml +++ b/org.simantics.plant3d.modeling.feature/feature.xml @@ -1,6 +1,6 @@ diff --git a/org.simantics.plant3d.modeling.feature/pom.xml b/org.simantics.plant3d.modeling.feature/pom.xml new file mode 100644 index 00000000..d39edccc --- /dev/null +++ b/org.simantics.plant3d.modeling.feature/pom.xml @@ -0,0 +1,15 @@ + + 4.0.0 + + + org.simantics.g3d + org.simantics.g3d.root + 1.0.0-SNAPSHOT + + + org.simantics.plant3d.modeling.feature + eclipse-feature + 1.0.0-SNAPSHOT + + diff --git a/org.simantics.plant3d.ontology/pom.xml b/org.simantics.plant3d.ontology/pom.xml new file mode 100644 index 00000000..cfef1e65 --- /dev/null +++ b/org.simantics.plant3d.ontology/pom.xml @@ -0,0 +1,17 @@ + + + 4.0.0 + + + org.simantics.g3d + org.simantics.g3d.root + 1.0.0-SNAPSHOT + + + org.simantics.plant3d.ontology + eclipse-plugin + 1.0.0-SNAPSHOT + + diff --git a/org.simantics.plant3d.ontology/src/org/simantics/plant3d/ontology/Plant3D.java b/org.simantics.plant3d.ontology/src/org/simantics/plant3d/ontology/Plant3D.java index 3e430365..817c9475 100644 --- a/org.simantics.plant3d.ontology/src/org/simantics/plant3d/ontology/Plant3D.java +++ b/org.simantics.plant3d.ontology/src/org/simantics/plant3d/ontology/Plant3D.java @@ -56,16 +56,14 @@ public class Plant3D { public final Resource HasBranch7; public final Resource HasBranch8; public final Resource HasBranch9; + public final Resource HasFixedNozzles; + public final Resource HasFixedNozzles_Inverse; public final Resource HasLength; public final Resource HasLength_Inverse; public final Resource HasNext; public final Resource HasNozzle; - public final Resource HasNozzleDefinition; - public final Resource HasNozzleDefinition_Inverse; public final Resource HasNozzleId; public final Resource HasNozzleId_Inverse; - public final Resource HasNozzleRestriction; - public final Resource HasNozzleRestriction_Inverse; public final Resource HasPipeDiameter; public final Resource HasPipeDiameter_Inverse; public final Resource HasPipeRun; @@ -87,6 +85,8 @@ public class Plant3D { public final Resource Images_Tank; public final Resource ImportedOntologies; public final Resource InlineComponent; + public final Resource IsFixedNozzle; + public final Resource IsFixedNozzle_Inverse; public final Resource IsReversed; public final Resource IsReversed_Inverse; public final Resource LibraryComponent; @@ -168,16 +168,14 @@ public class Plant3D { public static final String HasBranch7 = "http://www.simantics.org/Plant3D-0.1/HasBranch7"; public static final String HasBranch8 = "http://www.simantics.org/Plant3D-0.1/HasBranch8"; public static final String HasBranch9 = "http://www.simantics.org/Plant3D-0.1/HasBranch9"; + public static final String HasFixedNozzles = "http://www.simantics.org/Plant3D-0.1/HasFixedNozzles"; + public static final String HasFixedNozzles_Inverse = "http://www.simantics.org/Plant3D-0.1/HasFixedNozzles/Inverse"; public static final String HasLength = "http://www.simantics.org/Plant3D-0.1/HasLength"; public static final String HasLength_Inverse = "http://www.simantics.org/Plant3D-0.1/HasLength/Inverse"; public static final String HasNext = "http://www.simantics.org/Plant3D-0.1/HasNext"; public static final String HasNozzle = "http://www.simantics.org/Plant3D-0.1/HasNozzle"; - public static final String HasNozzleDefinition = "http://www.simantics.org/Plant3D-0.1/HasNozzleDefinition"; - public static final String HasNozzleDefinition_Inverse = "http://www.simantics.org/Plant3D-0.1/HasNozzleDefinition/Inverse"; public static final String HasNozzleId = "http://www.simantics.org/Plant3D-0.1/HasNozzleId"; public static final String HasNozzleId_Inverse = "http://www.simantics.org/Plant3D-0.1/HasNozzleId/Inverse"; - public static final String HasNozzleRestriction = "http://www.simantics.org/Plant3D-0.1/HasNozzleRestriction"; - public static final String HasNozzleRestriction_Inverse = "http://www.simantics.org/Plant3D-0.1/HasNozzleRestriction/Inverse"; public static final String HasPipeDiameter = "http://www.simantics.org/Plant3D-0.1/HasPipeDiameter"; public static final String HasPipeDiameter_Inverse = "http://www.simantics.org/Plant3D-0.1/HasPipeDiameter/Inverse"; public static final String HasPipeRun = "http://www.simantics.org/Plant3D-0.1/HasPipeRun"; @@ -199,6 +197,8 @@ public class Plant3D { public static final String Images_Tank = "http://www.simantics.org/Plant3D-0.1/Images/Tank"; public static final String ImportedOntologies = "http://www.simantics.org/Plant3D-0.1/ImportedOntologies"; public static final String InlineComponent = "http://www.simantics.org/Plant3D-0.1/InlineComponent"; + public static final String IsFixedNozzle = "http://www.simantics.org/Plant3D-0.1/IsFixedNozzle"; + public static final String IsFixedNozzle_Inverse = "http://www.simantics.org/Plant3D-0.1/IsFixedNozzle/Inverse"; public static final String IsReversed = "http://www.simantics.org/Plant3D-0.1/IsReversed"; public static final String IsReversed_Inverse = "http://www.simantics.org/Plant3D-0.1/IsReversed/Inverse"; public static final String LibraryComponent = "http://www.simantics.org/Plant3D-0.1/LibraryComponent"; @@ -290,16 +290,14 @@ public class Plant3D { HasBranch7 = getResourceOrNull(graph, URIs.HasBranch7); HasBranch8 = getResourceOrNull(graph, URIs.HasBranch8); HasBranch9 = getResourceOrNull(graph, URIs.HasBranch9); + HasFixedNozzles = getResourceOrNull(graph, URIs.HasFixedNozzles); + HasFixedNozzles_Inverse = getResourceOrNull(graph, URIs.HasFixedNozzles_Inverse); HasLength = getResourceOrNull(graph, URIs.HasLength); HasLength_Inverse = getResourceOrNull(graph, URIs.HasLength_Inverse); HasNext = getResourceOrNull(graph, URIs.HasNext); HasNozzle = getResourceOrNull(graph, URIs.HasNozzle); - HasNozzleDefinition = getResourceOrNull(graph, URIs.HasNozzleDefinition); - HasNozzleDefinition_Inverse = getResourceOrNull(graph, URIs.HasNozzleDefinition_Inverse); HasNozzleId = getResourceOrNull(graph, URIs.HasNozzleId); HasNozzleId_Inverse = getResourceOrNull(graph, URIs.HasNozzleId_Inverse); - HasNozzleRestriction = getResourceOrNull(graph, URIs.HasNozzleRestriction); - HasNozzleRestriction_Inverse = getResourceOrNull(graph, URIs.HasNozzleRestriction_Inverse); HasPipeDiameter = getResourceOrNull(graph, URIs.HasPipeDiameter); HasPipeDiameter_Inverse = getResourceOrNull(graph, URIs.HasPipeDiameter_Inverse); HasPipeRun = getResourceOrNull(graph, URIs.HasPipeRun); @@ -321,6 +319,8 @@ public class Plant3D { Images_Tank = getResourceOrNull(graph, URIs.Images_Tank); ImportedOntologies = getResourceOrNull(graph, URIs.ImportedOntologies); InlineComponent = getResourceOrNull(graph, URIs.InlineComponent); + IsFixedNozzle = getResourceOrNull(graph, URIs.IsFixedNozzle); + IsFixedNozzle_Inverse = getResourceOrNull(graph, URIs.IsFixedNozzle_Inverse); IsReversed = getResourceOrNull(graph, URIs.IsReversed); IsReversed_Inverse = getResourceOrNull(graph, URIs.IsReversed_Inverse); LibraryComponent = getResourceOrNull(graph, URIs.LibraryComponent); diff --git a/org.simantics.plant3d.product.feature/feature.xml b/org.simantics.plant3d.product.feature/feature.xml index d5fcf108..58c3143d 100644 --- a/org.simantics.plant3d.product.feature/feature.xml +++ b/org.simantics.plant3d.product.feature/feature.xml @@ -33,7 +33,7 @@ version="0.0.0"/> + 4.0.0 + + + org.simantics.g3d + org.simantics.g3d.root + 1.0.0-SNAPSHOT + + + org.simantics.plant3d.product.feature + eclipse-feature + 1.0.0-SNAPSHOT + + diff --git a/org.simantics.plant3d.product.repository/.project b/org.simantics.plant3d.product.repository/.project new file mode 100644 index 00000000..b11b67c4 --- /dev/null +++ b/org.simantics.plant3d.product.repository/.project @@ -0,0 +1,11 @@ + + + org.simantics.plant3d.product.repository + + + + + + + + diff --git a/org.simantics.plant3d.product/plant3d.product b/org.simantics.plant3d.product.repository/plant3d.product similarity index 100% rename from org.simantics.plant3d.product/plant3d.product rename to org.simantics.plant3d.product.repository/plant3d.product diff --git a/org.simantics.plant3d.product.repository/pom.xml b/org.simantics.plant3d.product.repository/pom.xml new file mode 100644 index 00000000..ad574413 --- /dev/null +++ b/org.simantics.plant3d.product.repository/pom.xml @@ -0,0 +1,57 @@ + + + 4.0.0 + org.simantics.plant3d.product.repository + 1.0.0-SNAPSHOT + eclipse-repository + + + org.simantics.g3d + org.simantics.g3d.root + 1.0.0-SNAPSHOT + + + + + + org.eclipse.tycho + tycho-p2-repository-plugin + ${tycho-version} + + true + true + + + + org.eclipse.tycho + tycho-p2-director-plugin + ${tycho-version} + + + materialize-products + + materialize-products + + + + archive-products + + archive-products + + + + + + + P3D.product + plant3d-${build.tag} + plant3d-${build.tag} + + + + + + + + diff --git a/org.simantics.plant3d.product/pom.xml b/org.simantics.plant3d.product/pom.xml new file mode 100644 index 00000000..11ef0db1 --- /dev/null +++ b/org.simantics.plant3d.product/pom.xml @@ -0,0 +1,14 @@ + + + 4.0.0 + org.simantics.plant3d.product + 1.0.0-SNAPSHOT + eclipse-plugin + + + org.simantics.g3d + org.simantics.g3d.root + 1.0.0-SNAPSHOT + + diff --git a/org.simantics.plant3d/pom.xml b/org.simantics.plant3d/pom.xml new file mode 100644 index 00000000..f8b057c0 --- /dev/null +++ b/org.simantics.plant3d/pom.xml @@ -0,0 +1,17 @@ + + + 4.0.0 + + + org.simantics.g3d + org.simantics.g3d.root + 1.0.0-SNAPSHOT + + + org.simantics.plant3d + eclipse-plugin + 1.0.0-SNAPSHOT + + diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/actions/RoutePipeAction.java b/org.simantics.plant3d/src/org/simantics/plant3d/actions/RoutePipeAction.java index 509ab38c..c922f38f 100644 --- a/org.simantics.plant3d/src/org/simantics/plant3d/actions/RoutePipeAction.java +++ b/org.simantics.plant3d/src/org/simantics/plant3d/actions/RoutePipeAction.java @@ -864,7 +864,7 @@ public class RoutePipeAction extends vtkSwtAction { String info = ""; Point3d sStart = new Point3d(); Point3d sEnd = new Point3d(); - s.getControlPointEnds(sStart, sEnd); + s.getEnds(sStart, sEnd); //detector.clearConstraintHighlights(); Point3d previousPipePoint = new Point3d(previousPosition); diff --git a/pom.xml b/pom.xml index e278711e..50a579b7 100644 --- a/pom.xml +++ b/pom.xml @@ -10,8 +10,9 @@ master http://www.simantics.org/download - 1.0.0 - 1.0.0 + 1.4.0 + 1.4.0 + SNAPSHOT @@ -145,5 +146,12 @@ org.simantics.g3d.feature org.simantics.g3d.repository + + org.simantics.plant3d + org.simantics.plant3d.modeling.feature + org.simantics.plant3d.ontology + org.simantics.plant3d.product + org.simantics.plant3d.product.feature + org.simantics.plant3d.product.repository -- 2.45.2