Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: 2
updates:
- package-ecosystem: maven
directory: "/"
directory: "/java"
schedule:
interval: daily
rebase-strategy: disabled
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ concurrency:

env:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
DEPLOY_DIR: ${{ github.workspace }}/java-test/m2deploy
DIFF_DIR: java-test/diff
TEST_APPLICATION_DIR: ${{ github.workspace }}/java-test/application-under-test
DEPLOY_DIR: ${{ github.workspace }}/java/java-test/m2deploy
DIFF_DIR: java/java-test/diff
TEST_APPLICATION_DIR: ${{ github.workspace }}/java/java-test/application-under-test

jobs:
docs:
Expand Down Expand Up @@ -227,7 +227,7 @@ jobs:
if [[ ${{github.ref}} == "refs/heads/main" || "${{github.ref}}" == refs/tags/* ]]; then
m2RepoPath="set-github::https://maven.pkg.github.com/${{ github.repository }}"
fi
mvn -T 1.5C -U -B clean deploy checkstyle:checkstyle --settings .github/settings.xml -DaltDeploymentRepository="$m2RepoPath"
mvn -T 1.5C -U -B -f java/pom.xml clean deploy checkstyle:checkstyle --settings .github/settings.xml -DaltDeploymentRepository="$m2RepoPath"
env:
GITHUB_TOKEN: ${{ github.token }}

Expand Down Expand Up @@ -322,7 +322,7 @@ jobs:
if [[ "${{ github.event_name }}" == "pull_request" || "${{github.ref}}" == refs/heads/release/* ]]; then
m2RepoPath="file://${{ env.DEPLOY_DIR }}"
fi
mvn -T 1.5C -U -B -f java-test/pom.xml clean verify \
mvn -T 1.5C -U -B -f java/java-test/pom.xml clean verify \
--settings ./.github/settings.xml \
-Dskip-test=false \
-Dm2-repo-path="$m2RepoPath" \
Expand Down
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,7 @@ siteplan*.json
org.sonarlint.eclipse.core.prefs

# Temporary PlanPro-file unzip direcotry of JUnit tests
**/res/toolbox
**/res/toolbox

# Temporary files for tycho pomless build
.polyglot.META-INF
8 changes: 8 additions & 0 deletions java/.mvn/extensions.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<extensions>
<extension>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-build</artifactId>
<version>5.0.2</version>
</extension>
</extensions>
2 changes: 2 additions & 0 deletions java/.mvn/maven.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-Dtycho-version=5.0.2
-Dtycho.pomless.parent=../..
17 changes: 0 additions & 17 deletions java/bundles/org.eclipse.set.application.set/pom.xml

This file was deleted.

17 changes: 0 additions & 17 deletions java/bundles/org.eclipse.set.application.test/pom.xml

This file was deleted.

17 changes: 0 additions & 17 deletions java/bundles/org.eclipse.set.application/pom.xml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
import java.util.Map;
import java.util.Optional;
import java.util.Queue;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.StreamSupport;

import org.eclipse.e4.core.services.events.IEventBroker;
Expand Down Expand Up @@ -100,55 +99,6 @@
GeoKanteGeometryService.class, EventHandler.class })
public class GeoKanteGeometryServiceImpl
implements GeoKanteGeometryService, EventHandler {
/**
* Helper class for storage geometry and metadata of Geo_Kante each sessions
*/
public static class GeoKanteGeometrySessionData {
private final Map<GEO_Kante, LineString> edgeGeometry;
private final Map<String, List<GEOKanteMetadata>> geoKanteMetadas;
private final Map<GEO_Knoten, Coordinate> geoNodeCoordinates;

/**
* COnstructor
*/
public GeoKanteGeometrySessionData() {
edgeGeometry = new ConcurrentHashMap<>();
geoKanteMetadas = new ConcurrentHashMap<>();
geoNodeCoordinates = new ConcurrentHashMap<>();
}

/**
* @return the geometry data
*/
public Map<GEO_Kante, LineString> getEdgeGeometry() {
return edgeGeometry;
}

/**
* @return the geokante metada
*/
public Map<String, List<GEOKanteMetadata>> getGeoKanteMetadas() {
return geoKanteMetadas;
}

/**
* @return the geometry coordinate of {@link GEO_Knoten}
*/
public Map<GEO_Knoten, Coordinate> getGeoNodeCoordinates() {
return geoNodeCoordinates;
}

/**
* Clear data
*/
public void clear() {
edgeGeometry.clear();
geoKanteMetadas.clear();
geoNodeCoordinates.clear();

}
}

private Thread findGeometryThread;
// Acceptable tolerance between the length of all GEO_Kante on a TOP_Kante
// and the length of the TOP_Kante
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
/**
* Copyright (c) 2025 DB InfraGO AG and others
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v2.0 which is available at
* https://www.eclipse.org/legal/epl-2.0.
*
* SPDX-License-Identifier: EPL-2.0
*
*/
package org.eclipse.set.application.geometry;

import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;

import org.eclipse.set.basis.geometry.GEOKanteMetadata;
import org.eclipse.set.model.planpro.Geodaten.GEO_Kante;
import org.eclipse.set.model.planpro.Geodaten.GEO_Knoten;
import org.locationtech.jts.geom.Coordinate;
import org.locationtech.jts.geom.LineString;

/**
* Store GeoKanteGeometry information for each session
*/
public class GeoKanteGeometrySessionData {

private final Map<GEO_Kante, LineString> edgeGeometry;
private final Map<String, List<GEOKanteMetadata>> geoKanteMetadas;

private final Map<GEO_Knoten, Coordinate> geoNodeCoordinates;

/**
* constructor
*/
public GeoKanteGeometrySessionData() {
edgeGeometry = new ConcurrentHashMap<>();
geoKanteMetadas = new ConcurrentHashMap<>();
geoNodeCoordinates = new ConcurrentHashMap<>();
}

/**
* @return the already found geometry
*/
public Map<GEO_Kante, LineString> getEdgeGeometry() {
return edgeGeometry;
}

/**
* @return the already found {@link GEOKanteMetadata}k
*/
public Map<String, List<GEOKanteMetadata>> getGeoKanteMetadas() {
return geoKanteMetadas;
}

/**
* @return the geometry coordinate of {@link GEO_Knoten}
*/
public Map<GEO_Knoten, Coordinate> getGeoNodeCoordinates() {
return geoNodeCoordinates;
}

/**
* Clear data
*/
public void clear() {
edgeGeometry.clear();
geoKanteMetadas.clear();
geoNodeCoordinates.clear();
}
}
17 changes: 0 additions & 17 deletions java/bundles/org.eclipse.set.basis.test/pom.xml

This file was deleted.

17 changes: 0 additions & 17 deletions java/bundles/org.eclipse.set.basis/pom.xml

This file was deleted.

17 changes: 0 additions & 17 deletions java/bundles/org.eclipse.set.core.services/pom.xml

This file was deleted.

17 changes: 0 additions & 17 deletions java/bundles/org.eclipse.set.core.test/pom.xml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
45580
17 changes: 0 additions & 17 deletions java/bundles/org.eclipse.set.core/pom.xml

This file was deleted.

17 changes: 0 additions & 17 deletions java/bundles/org.eclipse.set.emfforms/pom.xml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<packaging>eclipse-plugin</packaging>

<parent>
<relativePath>../../..</relativePath>
<relativePath>../..</relativePath>
<groupId>org.eclipse.set</groupId>
<artifactId>org.eclipse.set.releng.parent</artifactId>
<version>2.6.0-SNAPSHOT</version>
Expand Down
Loading
Loading