feature: duplicate mystic crypt entry in table implemented

gradle.properties

@@ -33,19 +33,19 @@ licenseGradlePluginVersion=0.16.1
 gradlePluginLombokVersion=8.1.0
 gradleIzpackPluginVersion=3.2
 grgitGradlePluginVersion=5.2.0
-spotlessGradlePluginVersion=6.19.0
-##############################
-# IzPackInstaller property   #
-##############################
+spotlessGradlePluginVersion=6.20.0
+############################
+# IzPackInstaller property #
+############################
 createIzPackInstaller=false
 #########################
 # dependencies versions #
 #########################
 izpackVersion=5.1.3
 lombokVersion=1.18.28
 modelDataVersion=2.1
-swingComponentsVersion=8
-swingBaseComponentsVersion=2.5
+swingComponentsVersion=8.1
+swingBaseComponentsVersion=2.6
 swingTreeComponentVersion=2.5
 swingRendererVersion=1.2
 swingTableComponentsVersion=2
@@ -109,14 +109,14 @@ autoBrowserVersion=2.0.6
 testObjectVersion=7.2
 junitJupiterExtensionsVersion=1.1
 assertjSwingVersion=3.17.1
-junitJupiterVersion=5.10.0-RC1
+junitJupiterVersion=5.10.0-RC2
 ##################
 # jar properties #
 ##################
 mainClass=io.github.astrapi69.mystic.crypt.StartMysticCryptApplication
-##############################
-# keystore properties keys   #
-##############################
+############################
+# keystore properties keys #
+############################
 mysticCryptStoreFile=release.mystic-crypt.store.file
 mysticCryptStoreType=release.mystic-crypt.store.type
 mysticCryptStorePassword=release.mystic-crypt.store.password

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 #Mon May 11 15:57:08 CEST 2020
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-rc-1-bin.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists

src/main/java/io/github/astrapi69/mystic/crypt/action/OpenPrivateKeyAction.java

@@ -190,7 +190,7 @@ protected void onApproveOption(final File file, final ActionEvent actionEvent)
 		{
 			if (PrivateKeyReader.isPemFormat(file))
 			{
-				privateKeyFormat = ReadFileExtensions.readFromFile(file);
+				privateKeyFormat = ReadFileExtensions.fromFile(file);
 			}
 			else
 			{

src/main/java/io/github/astrapi69/mystic/crypt/panel/checksum/ChecksumPanel.java

@@ -178,7 +178,7 @@ private void onOpenChecksumFile(ActionEvent actionEvent)
 				txtChecksumFile.setText(getModelObject().getSelectedChecksumFilename());
 				try
 				{
-					String checksum = ReadFileExtensions.readFromFile(selectedChecksumFile).trim();
+					String checksum = ReadFileExtensions.fromFile(selectedChecksumFile).trim();
 					System.out.println(checksum);
 					txtOwnersChecksum.setText(checksum);
 					txtOwnersChecksum.setEnabled(false);

src/main/java/io/github/astrapi69/mystic/crypt/panel/dbtree/SecretKeyTreeWithContentPanel.java

@@ -39,6 +39,9 @@
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreeModel;
 
+import io.github.astrapi69.mystic.crypt.panel.table.NewTableEntryModel;
+import io.github.astrapi69.mystic.crypt.panel.table.NewTableEntryPanel;
+import io.github.astrapi69.swing.model.label.LabelModel;
 import net.miginfocom.layout.AC;
 import net.miginfocom.layout.CC;
 import net.miginfocom.layout.LC;
@@ -498,7 +501,7 @@ protected void onTableSingleRightClick(MouseEvent mouseEvent)
 
 		JPopupMenu popup = JPopupMenuFactory.newJPopupMenu();
 
-		JMenuItem copyUsername = JMenuItemFactory.newJMenuItem("Copy Password",
+		JMenuItem copyUsername = JMenuItemFactory.newJMenuItem("Copy Username",
 			actionEvent -> this.onCopyUsernameTableEntry());
 		copyUsername.setEnabled(allSelectedRowData.size() == 1);
 		popup.add(copyUsername);
@@ -514,19 +517,25 @@ protected void onTableSingleRightClick(MouseEvent mouseEvent)
 			allSelectedRowData.size() == 1 && allSelectedRowData.get(0).getUrl() != null);
 		popup.add(openUrl);
 
+		JMenuItem openUrlAndAutotype = JMenuItemFactory.newJMenuItem("Autotype",
+			actionEvent -> this.onOpenUrlAndAutotypeOfTableEntry());
+		openUrl.setEnabled(
+			allSelectedRowData.size() == 1 && allSelectedRowData.get(0).getUrl() != null);
+		popup.add(openUrl);
+
 		// Separator
 		popup.addSeparator();
 
-		JMenuItem add = JMenuItemFactory.newJMenuItem("add ...",
+		JMenuItem add = JMenuItemFactory.newJMenuItem("add...",
 			actionEvent -> this.onAddTableEntry());
 		popup.add(add);
 
-		JMenuItem edit = JMenuItemFactory.newJMenuItem("edit",
+		JMenuItem edit = JMenuItemFactory.newJMenuItem("edit...",
 			actionEvent -> this.onEditTableEntry());
 		edit.setEnabled(allSelectedRowData.size() == 1);
 		popup.add(edit);
 
-		JMenuItem duplicate = JMenuItemFactory.newJMenuItem("duplicate",
+		JMenuItem duplicate = JMenuItemFactory.newJMenuItem("duplicate...",
 			actionEvent -> this.onDuplicateTableEntry());
 		duplicate.setEnabled(allSelectedRowData.size() == 1);
 		popup.add(duplicate);
@@ -546,16 +555,45 @@ protected void onTableSingleRightClick(MouseEvent mouseEvent)
 		popup.show(getTblTreeEntryTable(), x, y);
 	}
 
+	protected void onOpenUrlAndAutotypeOfTableEntry()
+	{
+		getTblTreeEntryTable().getSingleSelectedRowData().ifPresent(tableEntry -> {
+			// TODO IMPLEMENT ...
+		});
+	}
+
 	protected void onSelectAllTableEntries()
 	{
 		getTblTreeEntryTable().selectAll();
 	}
 
 	protected void onDuplicateTableEntry()
 	{
-		getTblTreeEntryTable().getSingleSelectedRowData().ifPresent(tableEntry -> {
+		getTblTreeEntryTable().getSingleSelectedRowData().ifPresent(selectedTableEntry -> {
+			MysticCryptEntryModelBean clonedMysticCryptEntry = CloneQuietlyExtensions
+				.clone(selectedTableEntry);
+
+			String newName = clonedMysticCryptEntry.getTitle() + "-Copy";
+			NewTableEntryModel newTableEntryModel = NewTableEntryModel.builder().name(newName)
+				.labelModelName(LabelModel.builder()
+					.text(Messages.getString("dialog.duplicate.crypt.entry.new.title.name",
+						"Name of title for duplicate"))
+					.build())
+				.build();
+
+			NewTableEntryPanel panel = new NewTableEntryPanel(BaseModel.of(newTableEntryModel));
+
+			int option = JOptionPaneExtensions.getSelectedOption(panel, JOptionPane.PLAIN_MESSAGE,
+				JOptionPane.OK_CANCEL_OPTION, null,
+				Messages.getString("dialog.duplicate.crypt.entry.title", "New title for duplicate"),
+				panel.getTxtName());
+			if (option == JOptionPane.OK_OPTION)
+			{
+				String name = panel.getModelObject().getName();
+				clonedMysticCryptEntry.setTitle(name);
 
-			// TODO...
+				addNewTableEntryToModel(clonedMysticCryptEntry);
+			}
 		});
 	}
 
@@ -633,27 +671,38 @@ protected void onAddTableEntry()
 				modelObject
 					.setExpires(panel.getMysticCryptEntryPanel().getTxtExpires().getSelectedDate());
 			}
-			DefaultMutableTreeNode selectedTreeNode = getSelectedTreeNode();
-			BaseTreeNode<GenericTreeElement<List<MysticCryptEntryModelBean>>, Long> selectedBaseTreeNode;
-			if (selectedTreeNode == null)
-			{
-				selectedBaseTreeNode = getModelObject().getRoot();
-			}
-			else
-			{
-				Object userObject = selectedTreeNode.getUserObject();
-				selectedBaseTreeNode = (BaseTreeNode<GenericTreeElement<List<MysticCryptEntryModelBean>>, Long>)userObject;
-			}
-			GenericTreeElement<List<MysticCryptEntryModelBean>> value = selectedBaseTreeNode
-				.getValue();
-			if (value.getDefaultContent() == null)
-			{
-				value.setDefaultContent(new ArrayList<>());
-			}
-			value.getDefaultContent().add(modelObject);
-			getTblTreeEntryTable().getGenericTableModel().add(modelObject);
-			getBaseTreeNodeModel();
+			addNewTableEntryToModel(modelObject);
+		}
+	}
+
+	private void addNewTableEntryToModel(MysticCryptEntryModelBean modelObject)
+	{
+		BaseTreeNode<GenericTreeElement<List<MysticCryptEntryModelBean>>, Long> selectedBaseTreeNode = getSelectedBaseTreeNode();
+
+		GenericTreeElement<List<MysticCryptEntryModelBean>> value = selectedBaseTreeNode.getValue();
+		if (value.getDefaultContent() == null)
+		{
+			value.setDefaultContent(new ArrayList<>());
+		}
+		value.getDefaultContent().add(modelObject);
+		getTblTreeEntryTable().getGenericTableModel().add(modelObject);
+		getBaseTreeNodeModel();
+	}
+
+	@SuppressWarnings("unchecked")
+	private BaseTreeNode<GenericTreeElement<List<MysticCryptEntryModelBean>>, Long> getSelectedBaseTreeNode()
+	{
+		DefaultMutableTreeNode selectedTreeNode = getSelectedTreeNode();
+		BaseTreeNode<GenericTreeElement<List<MysticCryptEntryModelBean>>, Long> selectedBaseTreeNode;
+		if (selectedTreeNode == null)
+		{
+			selectedBaseTreeNode = getModelObject().getRoot();
+		}
+		{
+			Object userObject = selectedTreeNode.getUserObject();
+			selectedBaseTreeNode = (BaseTreeNode<GenericTreeElement<List<MysticCryptEntryModelBean>>, Long>)userObject;
 		}
+		return selectedBaseTreeNode;
 	}
 
 	private void reloadApplicationTreeModel()

src/main/java/io/github/astrapi69/mystic/crypt/panel/table/NewTableEntryModel.java

@@ -0,0 +1,50 @@
+/**
+ * The MIT License
+ *
+ * Copyright (C) 2015 Asterios Raptis
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package io.github.astrapi69.mystic.crypt.panel.table;
+
+import io.github.astrapi69.swing.model.label.LabelModel;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.FieldDefaults;
+
+@Getter
+@Setter
+@EqualsAndHashCode
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder(toBuilder = true)
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class NewTableEntryModel
+{
+	String name;
+	LabelModel labelModelName;
+}