Merge pull request #495 from coanghel/develop

New Feature: Automatic naming for loadout EFT export (Issue #471)
GoldenGnu · Oct 27, 2024 · 707402f · 707402f
2 parents 4d90aaa + 487f733
commit 707402f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -674,6 +674,18 @@
 				<tests.to.skip>**/*OnlineTest.java</tests.to.skip>
 			</properties>
 		</profile>
+		<profile>
+		    <id>skip-all-tests</id>
+		    <activation>
+			<property>
+			    <name>skip-all-tests</name>
+			    <value>true</value>
+			</property>
+		    </activation>
+		    <properties>
+			<maven.test.skip>true</maven.test.skip>
+		    </properties>
+		</profile>
 		<profile>
 			<id>skip-online-price-tests</id>
 			<activation>

diff --git a/src/main/java/net/nikr/eve/jeveasset/gui/tabs/loadout/LoadoutsTab.java b/src/main/java/net/nikr/eve/jeveasset/gui/tabs/loadout/LoadoutsTab.java
@@ -375,7 +375,7 @@ private void exportEFT() {
 		if (exportAsset == null) {
 			return;
 		}
-		String buildName = getBuildName();
+		String buildName = getBuildName(exportAsset.getName());
 		if (buildName == null) {
 			return; //Cancel
 		}
@@ -459,16 +459,17 @@ private void writeCount(StringBuilder builder, Map<String, Long> modules) {
 		}
 	}
 
-	private String getBuildName() {
-		String buildName = JOptionInput.showInputDialog(program.getMainWindow().getFrame(), "Enter Build Name", "Export EFT", JOptionPane.PLAIN_MESSAGE);
+	private String getBuildName(String shipName) {
+		String defaultName = shipName.replaceFirst("\\s*\\([^)]*\\)\\s*$", "");
+		String buildName = (String) JOptionInput.showInputDialog(program.getMainWindow().getFrame(), "Enter Build Name", "Export EFT", JOptionPane.PLAIN_MESSAGE, null, null, defaultName);
 		if (buildName == null) {
 			return null; //Cancel
 		} else if (buildName.isEmpty()) {
 			JOptionPane.showMessageDialog(program.getMainWindow().getFrame(),
 					TabsLoadout.get().name1(),
 					TabsLoadout.get().empty(),
 					JOptionPane.PLAIN_MESSAGE);
-			return getBuildName();
+			return getBuildName(defaultName);
 		} else {
 			return buildName;
 		}