Skip to content

Commit

Permalink
Publish cadplan-extension 2.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@mukoki
mukoki committed Jan 15, 2022
1 parent c7e04b8 commit 2c5385c
Show file tree
Hide file tree
Showing 3 changed files with 94 additions and 28 deletions.
39 changes: 39 additions & 0 deletions distro-zip.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
<id>distro zip</id>
<formats>
<format>zip</format>
<!-- for development purposes -->
<format>dir</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<dependencySets>
<dependencySet>
<outputDirectory>/</outputDirectory>
<useTransitiveFiltering>false</useTransitiveFiltering>
<includes>
<include>*:cadtools-extension</include>
</includes>
</dependencySet>
<dependencySet>
<outputDirectory>/lib</outputDirectory>
<unpack>false</unpack>
<scope>runtime</scope>
<useTransitiveFiltering>true</useTransitiveFiltering>
<useProjectArtifact>false</useProjectArtifact>
<excludes>
<exclude>org.openjump:OpenJUMP</exclude>
<!-- some unneeded openpdf dependency -->
<exclude>com.google.code.findbugs:*</exclude>
</excludes>
</dependencySet>
<dependencySet>
<outputDirectory>/lib</outputDirectory>
<unpack>false</unpack>
<scope>system</scope>
<!--useTransitiveFiltering>true</useTransitiveFiltering-->
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>
</dependencySets>
</assembly>
74 changes: 52 additions & 22 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,37 +32,18 @@
<version>2.0-main-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.locationtech.jts</groupId>
<artifactId>jts-core</artifactId>
<version>${jts.version}</version>
</dependency>

<dependency>
<groupId>org.apache-extras.beanshell</groupId>
<artifactId>bsh</artifactId>
<version>2.0b6</version>
<scope>compile</scope>
</dependency>

<dependency>
<groupId>org.python</groupId>
<artifactId>jython</artifactId>
<version>2.2.1</version>
</dependency>

<dependency>
<groupId>cadplan4openjump</groupId>
<groupId>com.cadplan</groupId>
<artifactId>vertex-symbols</artifactId>
<version>2.0.0</version>
<version>2.2.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/vertex-symbols-2.0.0.jar</systemPath>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.11</version>
<systemPath>${project.basedir}/lib/vertex-symbols-2.2.0.jar</systemPath>
</dependency>

<dependency>
Expand All @@ -74,4 +55,53 @@

</dependencies>

<build>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.3.0</version>
<configuration>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
<executions>
<execution>
<id>distro zip</id>
<phase>package</phase>
<configuration>
<descriptors>
<descriptor>distro-zip.xml</descriptor>
</descriptors>
</configuration>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>net.nicoulaj.maven.plugins</groupId>
<artifactId>checksum-maven-plugin</artifactId>
<version>1.10</version>
<executions>
<execution>
<goals>
<goal>files</goal>
</goals>
<phase>package</phase>
<configuration>
<fileSets>
<fileSet>
<directory>${project.build.directory}</directory>
<includes>
<include>${project.build.finalName}.zip</include>
</includes>
</fileSet>
</fileSets>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>
9 changes: 3 additions & 6 deletions src/main/java/org/openjump/advancedtools/plugins/CalculateSelectionPlugIn.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,7 @@
*/
package org.openjump.advancedtools.plugins;

import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.*;

import org.openjump.advancedtools.utils.WorkbenchUtils;

Expand Down Expand Up @@ -113,7 +110,7 @@ public boolean execute(PlugInContext context) throws Exception {
context.getLayerViewPanel().getSelectionManager().clear();
}
@SuppressWarnings("unchecked")
Map<Layer, Collection<Feature>> layerToFeaturesInFenceMap = context
Map<Layer, Set<Feature>> layerToFeaturesInFenceMap = context
.getLayerViewPanel().visibleLayerToFeaturesInFenceMap(fence);

if (!layerToFeaturesInFenceMap.isEmpty()) {
Expand All @@ -135,7 +132,7 @@ public boolean execute(PlugInContext context) throws Exception {
* @param context plugin context
*/
protected void refreshSelection(
Map<Layer, Collection<Feature>> layerToFeaturesInFenceMap,
Map<Layer, Set<Feature>> layerToFeaturesInFenceMap,
PlugInContext context) {
Layer layer = context.getSelectedLayer(0);
boolean originalPanelUpdatesEnabled = context.getLayerViewPanel()
Expand Down

0 comments on commit 2c5385c

Please sign in to comment.