mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-17 18:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

renamed dataset to database in import dialog.

Browse Source
This commit is contained in:
Nick Davis 2017-06-12 19:24:18 -04:00
parent 89007f1eb0
commit e7065d57e3
3 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties
View File

@ -10,8 +10,6 @@ EnterpriseArtifactManagerImportDatabaseDialog.mustSelectHashDbFilePathMsg=A hash
EnterpriseArtifactManagerImportDatabaseDialog.hashDbDoesNotExistMsg=The selected hash database does not exist. EnterpriseArtifactManagerImportDatabaseDialog.hashDbDoesNotExistMsg=The selected hash database does not exist.
EnterpriseArtifactManagerImportDatabaseDialog.errorMessage.failedToOpenHashDbMsg=Failed to open hash database at {0}. EnterpriseArtifactManagerImportDatabaseDialog.errorMessage.failedToOpenHashDbMsg=Failed to open hash database at {0}.
EnterpriseArtifactManagerGlobalSettingsPanel.lbDatabaseSettings.text=Database Settings EnterpriseArtifactManagerGlobalSettingsPanel.lbDatabaseSettings.text=Database Settings
EnterpriseArtifactManagerImportDatabaseDialog.tfDatasetVersion.tooltip.text=Dataset Version Number
EnterpriseArtifactManagerImportDatabaseDialog.tfDatasetName.tooltip=Name for this dataset
EnterpriseArtifactManagerAddNewOrganizationDialog.tfName.tooltip=POC Name EnterpriseArtifactManagerAddNewOrganizationDialog.tfName.tooltip=POC Name
EnterpriseArtifactManagerGlobalSettingsPanel.correlationTypes.title=Correlation Types EnterpriseArtifactManagerGlobalSettingsPanel.correlationTypes.title=Correlation Types
EnterpriseArtifactManagerManageTagDialog.lbInstructions.text= EnterpriseArtifactManagerManageTagDialog.lbInstructions.text=
@ -40,11 +38,8 @@ EamImportDatabaseDialog.knownRadioButton.text=Known (NSRL or other)
EamImportDatabaseDialog.openButton.text=Open... EamImportDatabaseDialog.openButton.text=Open...
EamImportDatabaseDialog.databasePathTextField.text= EamImportDatabaseDialog.databasePathTextField.text=
EamImportDatabaseDialog.cancelButton.text=Cancel EamImportDatabaseDialog.cancelButton.text=Cancel
EamImportDatabaseDialog.lbDatasetVersion.text=Dataset Version:
EamImportDatabaseDialog.okButton.text=OK EamImportDatabaseDialog.okButton.text=OK
EamImportDatabaseDialog.lbDatasetName.text=Dataset Name:
EamImportDatabaseDialog.lbSourceOrganization.text=Source Organization: EamImportDatabaseDialog.lbSourceOrganization.text=Source Organization:
EamImportDatabaseDialog.lbDatasetAttribution.text=Dataset Attribution:
EamImportDatabaseDialog.lbDatabasePath.text=Database Path: EamImportDatabaseDialog.lbDatabasePath.text=Database Path:
EamManageTagDialog.cancelButton.text=Cancel EamManageTagDialog.cancelButton.text=Cancel
EamManageTagDialog.okButton.text=OK EamManageTagDialog.okButton.text=OK
@ -65,3 +60,8 @@ EamSqliteSettingsDialog.bnDatabasePathFileOpen.text=Open...
EamSqliteSettingsDialog.tfDatabasePath.toolTipText=Filename and path to store SQLite db file EamSqliteSettingsDialog.tfDatabasePath.toolTipText=Filename and path to store SQLite db file
EamSqliteSettingsDialog.tfDatabasePath.text= EamSqliteSettingsDialog.tfDatabasePath.text=
EamSqliteSettingsDialog.lbDatabasePath.text=Database Path : EamSqliteSettingsDialog.lbDatabasePath.text=Database Path :
EamImportDatabaseDialog.lbDatabaseVersion.text=Database Version:
EamImportDatabaseDialog.lbDatabaseName.text=Database Name:
EamImportDatabaseDialog.lbDatabaseAttribution.text=Database Attribution:
EnterpriseArtifactManagerImportDatabaseDialog.tfDatabaseName.tooltip=Name for this database
EnterpriseArtifactManagerImportDatabaseDialog.tfDatabaseVersion.tooltip.text=Database Version Number

40
Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/EamImportDatabaseDialog.form
View File

@ -47,7 +47,7 @@
<Component id="knownBadRadioButton" min="-2" max="-2" attributes="0"/> <Component id="knownBadRadioButton" min="-2" max="-2" attributes="0"/>
</Group> </Group>
</Group> </Group>
<Component id="lbDatasetAttribution" alignment="0" min="-2" max="-2" attributes="0"/> <Component id="lbDatabaseAttribution" alignment="0" min="-2" max="-2" attributes="0"/>
</Group> </Group>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/> <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group> </Group>
@ -62,9 +62,9 @@
<EmptySpace min="-2" pref="23" max="-2" attributes="0"/> <EmptySpace min="-2" pref="23" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0"> <Group type="102" attributes="0">
<Component id="lbDatasetVersion" min="-2" max="-2" attributes="0"/> <Component id="lbDatabaseVersion" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="tfDatasetVersion" min="-2" pref="154" max="-2" attributes="0"/> <Component id="tfDatabaseVersion" min="-2" pref="154" max="-2" attributes="0"/>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/> <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group> </Group>
<Group type="102" attributes="0"> <Group type="102" attributes="0">
@ -73,11 +73,11 @@
<Component id="bnNewOrganization" min="-2" max="-2" attributes="0"/> <Component id="bnNewOrganization" min="-2" max="-2" attributes="0"/>
</Group> </Group>
<Group type="102" alignment="0" attributes="0"> <Group type="102" alignment="0" attributes="0">
<Component id="lbDatasetName" min="-2" max="-2" attributes="0"/> <Component id="lbDatabaseName" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="12" max="-2" attributes="0"/> <EmptySpace min="-2" pref="12" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Component id="comboboxSourceOrganization" alignment="1" max="32767" attributes="0"/> <Component id="comboboxSourceOrganization" alignment="1" max="32767" attributes="0"/>
<Component id="tfDatasetName" max="32767" attributes="0"/> <Component id="tfDatabaseName" max="32767" attributes="0"/>
</Group> </Group>
</Group> </Group>
</Group> </Group>
@ -107,7 +107,7 @@
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="knownBadRadioButton" min="-2" max="-2" attributes="0"/> <Component id="knownBadRadioButton" min="-2" max="-2" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/> <EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="lbDatasetAttribution" min="-2" max="-2" attributes="0"/> <Component id="lbDatabaseAttribution" min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" max="-2" attributes="0"> <Group type="103" groupAlignment="0" max="-2" attributes="0">
<Component id="bnNewOrganization" min="-2" max="-2" attributes="0"/> <Component id="bnNewOrganization" min="-2" max="-2" attributes="0"/>
<Group type="102" attributes="0"> <Group type="102" attributes="0">
@ -119,13 +119,13 @@
<Component id="comboboxSourceOrganization" min="-2" max="-2" attributes="0"/> <Component id="comboboxSourceOrganization" min="-2" max="-2" attributes="0"/>
<EmptySpace type="separate" max="-2" attributes="0"/> <EmptySpace type="separate" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" max="-2" attributes="0"> <Group type="103" groupAlignment="0" max="-2" attributes="0">
<Component id="tfDatasetName" max="32767" attributes="0"/> <Component id="tfDatabaseName" max="32767" attributes="0"/>
<Component id="lbDatasetName" min="-2" pref="20" max="-2" attributes="0"/> <Component id="lbDatabaseName" min="-2" pref="20" max="-2" attributes="0"/>
</Group> </Group>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0"> <Group type="103" groupAlignment="3" attributes="0">
<Component id="lbDatasetVersion" alignment="3" min="-2" pref="20" max="-2" attributes="0"/> <Component id="lbDatabaseVersion" alignment="3" min="-2" pref="20" max="-2" attributes="0"/>
<Component id="tfDatasetVersion" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="tfDatabaseVersion" alignment="3" min="-2" max="-2" attributes="0"/>
</Group> </Group>
<EmptySpace type="separate" max="-2" attributes="0"/> <EmptySpace type="separate" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
@ -213,10 +213,10 @@
</Property> </Property>
</Properties> </Properties>
</Component> </Component>
<Component class="javax.swing.JLabel" name="lbDatasetAttribution"> <Component class="javax.swing.JLabel" name="lbDatabaseAttribution">
<Properties> <Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="EamImportDatabaseDialog.lbDatasetAttribution.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/> <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="EamImportDatabaseDialog.lbDatabaseAttribution.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property> </Property>
</Properties> </Properties>
</Component> </Component>
@ -227,17 +227,17 @@
</Property> </Property>
</Properties> </Properties>
</Component> </Component>
<Component class="javax.swing.JLabel" name="lbDatasetName"> <Component class="javax.swing.JLabel" name="lbDatabaseName">
<Properties> <Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="EamImportDatabaseDialog.lbDatasetName.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/> <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="EamImportDatabaseDialog.lbDatabaseName.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property> </Property>
</Properties> </Properties>
</Component> </Component>
<Component class="javax.swing.JLabel" name="lbDatasetVersion"> <Component class="javax.swing.JLabel" name="lbDatabaseVersion">
<Properties> <Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="EamImportDatabaseDialog.lbDatasetVersion.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/> <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="EamImportDatabaseDialog.lbDatabaseVersion.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property> </Property>
</Properties> </Properties>
</Component> </Component>
@ -259,17 +259,17 @@
<AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;String&gt;"/> <AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;String&gt;"/>
</AuxValues> </AuxValues>
</Component> </Component>
<Component class="javax.swing.JTextField" name="tfDatasetName"> <Component class="javax.swing.JTextField" name="tfDatabaseName">
<Properties> <Properties>
<Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="EnterpriseArtifactManagerImportDatabaseDialog.tfDatasetName.tooltip" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/> <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="EnterpriseArtifactManagerImportDatabaseDialog.tfDatabaseName.tooltip" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property> </Property>
</Properties> </Properties>
</Component> </Component>
<Component class="javax.swing.JTextField" name="tfDatasetVersion"> <Component class="javax.swing.JTextField" name="tfDatabaseVersion">
<Properties> <Properties>
<Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="EnterpriseArtifactManagerImportDatabaseDialog.tfDatasetVersion.tooltip.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/> <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="EnterpriseArtifactManagerImportDatabaseDialog.tfDatabaseVersion.tooltip.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property> </Property>
</Properties> </Properties>
</Component> </Component>

62
Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/EamImportDatabaseDialog.java
View File

@ -107,8 +107,8 @@ final class EamImportDatabaseDialog extends javax.swing.JDialog {
* Register for notifications when the text boxes get updated. * Register for notifications when the text boxes get updated.
*/ */
private void setTextBoxListeners() { private void setTextBoxListeners() {
textBoxes.add(tfDatasetName); textBoxes.add(tfDatabaseName);
textBoxes.add(tfDatasetVersion); textBoxes.add(tfDatabaseVersion);
addDocumentListeners(textBoxes, textBoxChangedListener); addDocumentListeners(textBoxes, textBoxChangedListener);
} }
@ -145,8 +145,8 @@ final class EamImportDatabaseDialog extends javax.swing.JDialog {
* @return True or false. * @return True or false.
*/ */
private boolean textFieldsArePopulated() { private boolean textFieldsArePopulated() {
return !tfDatasetName.getText().trim().isEmpty() return !tfDatabaseName.getText().trim().isEmpty()
&& !tfDatasetVersion.getText().trim().isEmpty() && !tfDatabaseVersion.getText().trim().isEmpty()
&& !databasePathTextField.getText().trim().isEmpty(); && !databasePathTextField.getText().trim().isEmpty();
} }
@ -247,13 +247,13 @@ final class EamImportDatabaseDialog extends javax.swing.JDialog {
knownBadRadioButton = new javax.swing.JRadioButton(); knownBadRadioButton = new javax.swing.JRadioButton();
lbDatabaseType = new javax.swing.JLabel(); lbDatabaseType = new javax.swing.JLabel();
lbDatabasePath = new javax.swing.JLabel(); lbDatabasePath = new javax.swing.JLabel();
lbDatasetAttribution = new javax.swing.JLabel(); lbDatabaseAttribution = new javax.swing.JLabel();
lbSourceOrganization = new javax.swing.JLabel(); lbSourceOrganization = new javax.swing.JLabel();
lbDatasetName = new javax.swing.JLabel(); lbDatabaseName = new javax.swing.JLabel();
lbDatasetVersion = new javax.swing.JLabel(); lbDatabaseVersion = new javax.swing.JLabel();
comboboxSourceOrganization = new javax.swing.JComboBox<>(); comboboxSourceOrganization = new javax.swing.JComboBox<>();
tfDatasetName = new javax.swing.JTextField(); tfDatabaseName = new javax.swing.JTextField();
tfDatasetVersion = new javax.swing.JTextField(); tfDatabaseVersion = new javax.swing.JTextField();
bnNewOrganization = new javax.swing.JButton(); bnNewOrganization = new javax.swing.JButton();
lbWarningMsg = new javax.swing.JLabel(); lbWarningMsg = new javax.swing.JLabel();
@ -293,13 +293,13 @@ final class EamImportDatabaseDialog extends javax.swing.JDialog {
org.openide.awt.Mnemonics.setLocalizedText(lbDatabasePath, org.openide.util.NbBundle.getMessage(EamImportDatabaseDialog.class, "EamImportDatabaseDialog.lbDatabasePath.text")); // NOI18N org.openide.awt.Mnemonics.setLocalizedText(lbDatabasePath, org.openide.util.NbBundle.getMessage(EamImportDatabaseDialog.class, "EamImportDatabaseDialog.lbDatabasePath.text")); // NOI18N
org.openide.awt.Mnemonics.setLocalizedText(lbDatasetAttribution, org.openide.util.NbBundle.getMessage(EamImportDatabaseDialog.class, "EamImportDatabaseDialog.lbDatasetAttribution.text")); // NOI18N org.openide.awt.Mnemonics.setLocalizedText(lbDatabaseAttribution, org.openide.util.NbBundle.getMessage(EamImportDatabaseDialog.class, "EamImportDatabaseDialog.lbDatabaseAttribution.text")); // NOI18N
org.openide.awt.Mnemonics.setLocalizedText(lbSourceOrganization, org.openide.util.NbBundle.getMessage(EamImportDatabaseDialog.class, "EamImportDatabaseDialog.lbSourceOrganization.text")); // NOI18N org.openide.awt.Mnemonics.setLocalizedText(lbSourceOrganization, org.openide.util.NbBundle.getMessage(EamImportDatabaseDialog.class, "EamImportDatabaseDialog.lbSourceOrganization.text")); // NOI18N
org.openide.awt.Mnemonics.setLocalizedText(lbDatasetName, org.openide.util.NbBundle.getMessage(EamImportDatabaseDialog.class, "EamImportDatabaseDialog.lbDatasetName.text")); // NOI18N org.openide.awt.Mnemonics.setLocalizedText(lbDatabaseName, org.openide.util.NbBundle.getMessage(EamImportDatabaseDialog.class, "EamImportDatabaseDialog.lbDatabaseName.text")); // NOI18N
org.openide.awt.Mnemonics.setLocalizedText(lbDatasetVersion, org.openide.util.NbBundle.getMessage(EamImportDatabaseDialog.class, "EamImportDatabaseDialog.lbDatasetVersion.text")); // NOI18N org.openide.awt.Mnemonics.setLocalizedText(lbDatabaseVersion, org.openide.util.NbBundle.getMessage(EamImportDatabaseDialog.class, "EamImportDatabaseDialog.lbDatabaseVersion.text")); // NOI18N
comboboxSourceOrganization.setModel(new javax.swing.DefaultComboBoxModel<>(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" })); comboboxSourceOrganization.setModel(new javax.swing.DefaultComboBoxModel<>(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
comboboxSourceOrganization.addActionListener(new java.awt.event.ActionListener() { comboboxSourceOrganization.addActionListener(new java.awt.event.ActionListener() {
@ -308,9 +308,9 @@ final class EamImportDatabaseDialog extends javax.swing.JDialog {
} }
}); });
tfDatasetName.setToolTipText(org.openide.util.NbBundle.getMessage(EamImportDatabaseDialog.class, "EnterpriseArtifactManagerImportDatabaseDialog.tfDatasetName.tooltip")); // NOI18N tfDatabaseName.setToolTipText(org.openide.util.NbBundle.getMessage(EamImportDatabaseDialog.class, "EnterpriseArtifactManagerImportDatabaseDialog.tfDatabaseName.tooltip")); // NOI18N
tfDatasetVersion.setToolTipText(org.openide.util.NbBundle.getMessage(EamImportDatabaseDialog.class, "EnterpriseArtifactManagerImportDatabaseDialog.tfDatasetVersion.tooltip.text")); // NOI18N tfDatabaseVersion.setToolTipText(org.openide.util.NbBundle.getMessage(EamImportDatabaseDialog.class, "EnterpriseArtifactManagerImportDatabaseDialog.tfDatabaseVersion.tooltip.text")); // NOI18N
org.openide.awt.Mnemonics.setLocalizedText(bnNewOrganization, org.openide.util.NbBundle.getMessage(EamImportDatabaseDialog.class, "EamImportDatabaseDialog.bnNewOrganization.text")); // NOI18N org.openide.awt.Mnemonics.setLocalizedText(bnNewOrganization, org.openide.util.NbBundle.getMessage(EamImportDatabaseDialog.class, "EamImportDatabaseDialog.bnNewOrganization.text")); // NOI18N
bnNewOrganization.addActionListener(new java.awt.event.ActionListener() { bnNewOrganization.addActionListener(new java.awt.event.ActionListener() {
@ -343,7 +343,7 @@ final class EamImportDatabaseDialog extends javax.swing.JDialog {
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(knownRadioButton) .addComponent(knownRadioButton)
.addComponent(knownBadRadioButton))) .addComponent(knownBadRadioButton)))
.addComponent(lbDatasetAttribution)) .addComponent(lbDatabaseAttribution))
.addGap(0, 0, Short.MAX_VALUE)) .addGap(0, 0, Short.MAX_VALUE))
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
@ -355,20 +355,20 @@ final class EamImportDatabaseDialog extends javax.swing.JDialog {
.addGap(23, 23, 23) .addGap(23, 23, 23)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup() .addGroup(layout.createSequentialGroup()
.addComponent(lbDatasetVersion) .addComponent(lbDatabaseVersion)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(tfDatasetVersion, javax.swing.GroupLayout.PREFERRED_SIZE, 154, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(tfDatabaseVersion, javax.swing.GroupLayout.PREFERRED_SIZE, 154, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(0, 0, Short.MAX_VALUE)) .addGap(0, 0, Short.MAX_VALUE))
.addGroup(layout.createSequentialGroup() .addGroup(layout.createSequentialGroup()
.addComponent(lbSourceOrganization) .addComponent(lbSourceOrganization)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(bnNewOrganization)) .addComponent(bnNewOrganization))
.addGroup(layout.createSequentialGroup() .addGroup(layout.createSequentialGroup()
.addComponent(lbDatasetName) .addComponent(lbDatabaseName)
.addGap(12, 12, 12) .addGap(12, 12, 12)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(comboboxSourceOrganization, javax.swing.GroupLayout.Alignment.TRAILING, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(comboboxSourceOrganization, javax.swing.GroupLayout.Alignment.TRAILING, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(tfDatasetName)))))) .addComponent(tfDatabaseName))))))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(openButton))) .addComponent(openButton)))
.addContainerGap()) .addContainerGap())
@ -391,7 +391,7 @@ final class EamImportDatabaseDialog extends javax.swing.JDialog {
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(knownBadRadioButton) .addComponent(knownBadRadioButton)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(lbDatasetAttribution) .addComponent(lbDatabaseAttribution)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
.addComponent(bnNewOrganization) .addComponent(bnNewOrganization)
.addGroup(layout.createSequentialGroup() .addGroup(layout.createSequentialGroup()
@ -401,12 +401,12 @@ final class EamImportDatabaseDialog extends javax.swing.JDialog {
.addComponent(comboboxSourceOrganization, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(comboboxSourceOrganization, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(18, 18, 18) .addGap(18, 18, 18)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
.addComponent(tfDatasetName) .addComponent(tfDatabaseName)
.addComponent(lbDatasetName, javax.swing.GroupLayout.PREFERRED_SIZE, 20, javax.swing.GroupLayout.PREFERRED_SIZE)) .addComponent(lbDatabaseName, javax.swing.GroupLayout.PREFERRED_SIZE, 20, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(lbDatasetVersion, javax.swing.GroupLayout.PREFERRED_SIZE, 20, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(lbDatabaseVersion, javax.swing.GroupLayout.PREFERRED_SIZE, 20, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(tfDatasetVersion, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addComponent(tfDatabaseVersion, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGap(18, 18, 18) .addGap(18, 18, 18)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(lbWarningMsg, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(lbWarningMsg, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
@ -452,8 +452,8 @@ final class EamImportDatabaseDialog extends javax.swing.JDialog {
EamDb dbManager = EamDb.getInstance(); EamDb dbManager = EamDb.getInstance();
EamGlobalSet eamGlobalSet = new EamGlobalSet( EamGlobalSet eamGlobalSet = new EamGlobalSet(
selectedOrg.getOrgID(), selectedOrg.getOrgID(),
tfDatasetName.getText().trim(), tfDatabaseName.getText().trim(),
tfDatasetVersion.getText().trim(), tfDatabaseVersion.getText().trim(),
LocalDate.now()); LocalDate.now());
return dbManager.newGlobalSet(eamGlobalSet); return dbManager.newGlobalSet(eamGlobalSet);
} }
@ -621,16 +621,16 @@ final class EamImportDatabaseDialog extends javax.swing.JDialog {
private javax.swing.JTextField databasePathTextField; private javax.swing.JTextField databasePathTextField;
private javax.swing.JRadioButton knownBadRadioButton; private javax.swing.JRadioButton knownBadRadioButton;
private javax.swing.JRadioButton knownRadioButton; private javax.swing.JRadioButton knownRadioButton;
private javax.swing.JLabel lbDatabaseAttribution;
private javax.swing.JLabel lbDatabaseName;
private javax.swing.JLabel lbDatabasePath; private javax.swing.JLabel lbDatabasePath;
private javax.swing.JLabel lbDatabaseType; private javax.swing.JLabel lbDatabaseType;
private javax.swing.JLabel lbDatasetAttribution; private javax.swing.JLabel lbDatabaseVersion;
private javax.swing.JLabel lbDatasetName;
private javax.swing.JLabel lbDatasetVersion;
private javax.swing.JLabel lbSourceOrganization; private javax.swing.JLabel lbSourceOrganization;
private javax.swing.JLabel lbWarningMsg; private javax.swing.JLabel lbWarningMsg;
private javax.swing.JButton okButton; private javax.swing.JButton okButton;
private javax.swing.JButton openButton; private javax.swing.JButton openButton;
private javax.swing.JTextField tfDatasetName; private javax.swing.JTextField tfDatabaseName;
private javax.swing.JTextField tfDatasetVersion; private javax.swing.JTextField tfDatabaseVersion;
// End of variables declaration//GEN-END:variables // End of variables declaration//GEN-END:variables
} }