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

5063 address some codacy complaints

Browse Source
This commit is contained in:
William Schaefer 2019-05-22 18:37:00 -04:00
parent 58e2a4953e
commit a02319ba6f
6 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/src/org/sleuthkit/autopsy/texttranslation/translators/Bundle.properties
View File

@ -1,4 +1,4 @@
GoogleTranslatorSettingsPanel.browseButton.text=Browse GoogleTranslatorSettingsPanel.browseButton.text=Browse
GoogleTranslatorSettingsPanel.credentialsLabel.text=Credentials: GoogleTranslatorSettingsPanel.credentialsLabel.text=Credentials:
GoogleTranslatorSettingsPanel.jLabel1.text=Target Language:
GoogleTranslatorSettingsPanel.warningLabel.text= GoogleTranslatorSettingsPanel.warningLabel.text=
GoogleTranslatorSettingsPanel.targetLanguageLabel.text=Target Language:

2
Core/src/org/sleuthkit/autopsy/texttranslation/translators/Bundle.properties-MERGED
View File

@ -8,6 +8,6 @@ GoogleTranslatorSettingsPanel.errorMessage.unableToReadCredentials=Unable to rea
GoogleTranslatorSettingsPanel.errorMessage.unknownFailureGetting=Failure getting list of supported languages with current credentials file. GoogleTranslatorSettingsPanel.errorMessage.unknownFailureGetting=Failure getting list of supported languages with current credentials file.
GoogleTranslatorSettingsPanel.errorMessage.unknownFailurePopulating=Failure populating list of supported languages with current credentials file. GoogleTranslatorSettingsPanel.errorMessage.unknownFailurePopulating=Failure populating list of supported languages with current credentials file.
GoogleTranslatorSettingsPanel.fileChooser.confirmButton=Select GoogleTranslatorSettingsPanel.fileChooser.confirmButton=Select
GoogleTranslatorSettingsPanel.jLabel1.text=Target Language:
GoogleTranslatorSettingsPanel.json.description=JSON Files GoogleTranslatorSettingsPanel.json.description=JSON Files
GoogleTranslatorSettingsPanel.warningLabel.text= GoogleTranslatorSettingsPanel.warningLabel.text=
GoogleTranslatorSettingsPanel.targetLanguageLabel.text=Target Language:

17
Core/src/org/sleuthkit/autopsy/texttranslation/translators/GoogleTranslator.java
View File

@ -46,7 +46,7 @@ public final class GoogleTranslator implements TextTranslator {
private static final int MAX_STRING_LENGTH = 15000; private static final int MAX_STRING_LENGTH = 15000;
private final GoogleTranslatorSettingsPanel settingsPanel; private final GoogleTranslatorSettingsPanel settingsPanel;
private final GoogleTranslatorSettings settings = new GoogleTranslatorSettings(); private final GoogleTranslatorSettings settings = new GoogleTranslatorSettings();
private Translate translate; private Translate googleTranslate;
/** /**
* Constructs a new GoogleTranslator * Constructs a new GoogleTranslator
@ -59,7 +59,7 @@ public final class GoogleTranslator implements TextTranslator {
@Override @Override
public String translate(String string) throws TranslationException { public String translate(String string) throws TranslationException {
if (translate != null) { if (googleTranslate != null) {
try { try {
// Translates some text into English, without specifying the source language. // Translates some text into English, without specifying the source language.
@ -72,21 +72,22 @@ public final class GoogleTranslator implements TextTranslator {
// The API complains if the "Payload" is over 204800 bytes. I'm assuming that // The API complains if the "Payload" is over 204800 bytes. I'm assuming that
// deals with the full request. At some point, we get different errors about too // deals with the full request. At some point, we get different errors about too
// much text. Officially, Google says they will translate only 5k chars, // much text. Officially, Google says they will googleTranslate only 5k chars,
// but we have seen more than that working. // but we have seen more than that working.
// there could be a value betwen 15k and 25k that works. I (BC) didn't test further // there could be a value betwen 15k and 25k that works. I (BC) didn't test further
if (substring.length() > MAX_STRING_LENGTH) { if (substring.length() > MAX_STRING_LENGTH) {
substring = substring.substring(0, MAX_STRING_LENGTH); substring = substring.substring(0, MAX_STRING_LENGTH);
} }
Translation translation Translation translation
= translate.translate(substring); = googleTranslate.translate(substring);
String translatedString = translation.getTranslatedText(); String translatedString = translation.getTranslatedText();
// put back the newlines // put back the newlines
translatedString = translatedString.replaceAll("<br />", "\n"); translatedString = translatedString.replaceAll("<br />", "\n");
return translatedString; return translatedString;
} catch (Throwable e) { } catch (Throwable ex) {
throw new TranslationException(e.getMessage()); //Catching throwables because some of this Google Translate code throws throwables
throw new TranslationException("Failure translating using GoogleTranslator", ex);
} }
} else { } else {
throw new TranslationException("Google Translator has not been configured, credentials need to be specified"); throw new TranslationException("Google Translator has not been configured, credentials need to be specified");
@ -125,12 +126,12 @@ public final class GoogleTranslator implements TextTranslator {
} }
if (creds == null) { if (creds == null) {
logger.log(Level.WARNING, "Credentials were not successfully made, no translations will be available from the GoogleTranslator"); logger.log(Level.WARNING, "Credentials were not successfully made, no translations will be available from the GoogleTranslator");
translate = null; googleTranslate = null;
} else { } else {
TranslateOptions.Builder builder = TranslateOptions.newBuilder(); TranslateOptions.Builder builder = TranslateOptions.newBuilder();
builder.setCredentials(creds); builder.setCredentials(creds);
builder.setTargetLanguage(settings.getTargetLanguageCode()); builder.setTargetLanguage(settings.getTargetLanguageCode());
translate = builder.build().getService(); googleTranslate = builder.build().getService();
} }
} }

8
Core/src/org/sleuthkit/autopsy/texttranslation/translators/GoogleTranslatorSettingsPanel.form
View File

@ -26,7 +26,7 @@
<Group type="102" attributes="0"> <Group type="102" attributes="0">
<Group type="103" groupAlignment="0" max="-2" attributes="0"> <Group type="103" groupAlignment="0" max="-2" attributes="0">
<Component id="credentialsLabel" max="32767" attributes="0"/> <Component id="credentialsLabel" max="32767" attributes="0"/>
<Component id="jLabel1" max="32767" attributes="0"/> <Component id="targetLanguageLabel" max="32767" attributes="0"/>
</Group> </Group>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
@ -57,7 +57,7 @@
</Group> </Group>
<EmptySpace type="unrelated" max="-2" attributes="0"/> <EmptySpace type="unrelated" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0"> <Group type="103" groupAlignment="3" attributes="0">
<Component id="jLabel1" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="targetLanguageLabel" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="targetLanguageComboBox" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="targetLanguageComboBox" alignment="3" min="-2" max="-2" attributes="0"/>
</Group> </Group>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
@ -101,10 +101,10 @@
<AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;org.sleuthkit.autopsy.texttranslation.translators.GoogleLanguageWrapper&gt;"/> <AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;org.sleuthkit.autopsy.texttranslation.translators.GoogleLanguageWrapper&gt;"/>
</AuxValues> </AuxValues>
</Component> </Component>
<Component class="javax.swing.JLabel" name="jLabel1"> <Component class="javax.swing.JLabel" name="targetLanguageLabel">
<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/texttranslation/translators/Bundle.properties" key="GoogleTranslatorSettingsPanel.jLabel1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/> <ResourceString bundle="org/sleuthkit/autopsy/texttranslation/translators/Bundle.properties" key="GoogleTranslatorSettingsPanel.targetLanguageLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property> </Property>
</Properties> </Properties>
</Component> </Component>

13
Core/src/org/sleuthkit/autopsy/texttranslation/translators/GoogleTranslatorSettingsPanel.java
View File

@ -73,13 +73,13 @@ public class GoogleTranslatorSettingsPanel extends javax.swing.JPanel {
//This method also has the side effect of more or less validating the JSON file which was selected as it is necessary to get the list of target languages //This method also has the side effect of more or less validating the JSON file which was selected as it is necessary to get the list of target languages
try { try {
InputStream credentialStream; InputStream credentialStream;
Credentials creds;
try { try {
credentialStream = new FileInputStream(credentialsPathField.getText()); credentialStream = new FileInputStream(credentialsPathField.getText());
} catch (FileNotFoundException ignored) { } catch (FileNotFoundException ignored) {
warningLabel.setText(Bundle.GoogleTranslatorSettingsPanel_errorMessage_fileNotFound()); warningLabel.setText(Bundle.GoogleTranslatorSettingsPanel_errorMessage_fileNotFound());
return new ArrayList<>(); return new ArrayList<>();
} }
Credentials creds;
try { try {
creds = ServiceAccountCredentials.fromStream(credentialStream); creds = ServiceAccountCredentials.fromStream(credentialStream);
} catch (IOException ignored) { } catch (IOException ignored) {
@ -98,6 +98,7 @@ public class GoogleTranslatorSettingsPanel extends javax.swing.JPanel {
return builder.build().getService().listSupportedLanguages(); return builder.build().getService().listSupportedLanguages();
} }
} catch (Throwable throwable) { } catch (Throwable throwable) {
//Catching throwables because some of this Google Translate code throws throwables
warningLabel.setText(Bundle.GoogleTranslatorSettingsPanel_errorMessage_unknownFailureGetting()); warningLabel.setText(Bundle.GoogleTranslatorSettingsPanel_errorMessage_unknownFailureGetting());
logger.log(Level.WARNING, "Throwable caught while getting list of supported languages", throwable); logger.log(Level.WARNING, "Throwable caught while getting list of supported languages", throwable);
return new ArrayList<>(); return new ArrayList<>();
@ -164,7 +165,7 @@ public class GoogleTranslatorSettingsPanel extends javax.swing.JPanel {
credentialsPathField = new javax.swing.JTextField(); credentialsPathField = new javax.swing.JTextField();
browseButton = new javax.swing.JButton(); browseButton = new javax.swing.JButton();
targetLanguageComboBox = new javax.swing.JComboBox<>(); targetLanguageComboBox = new javax.swing.JComboBox<>();
jLabel1 = new javax.swing.JLabel(); targetLanguageLabel = new javax.swing.JLabel();
warningLabel = new javax.swing.JLabel(); warningLabel = new javax.swing.JLabel();
org.openide.awt.Mnemonics.setLocalizedText(credentialsLabel, org.openide.util.NbBundle.getMessage(GoogleTranslatorSettingsPanel.class, "GoogleTranslatorSettingsPanel.credentialsLabel.text")); // NOI18N org.openide.awt.Mnemonics.setLocalizedText(credentialsLabel, org.openide.util.NbBundle.getMessage(GoogleTranslatorSettingsPanel.class, "GoogleTranslatorSettingsPanel.credentialsLabel.text")); // NOI18N
@ -180,7 +181,7 @@ public class GoogleTranslatorSettingsPanel extends javax.swing.JPanel {
targetLanguageComboBox.setEnabled(false); targetLanguageComboBox.setEnabled(false);
org.openide.awt.Mnemonics.setLocalizedText(jLabel1, org.openide.util.NbBundle.getMessage(GoogleTranslatorSettingsPanel.class, "GoogleTranslatorSettingsPanel.jLabel1.text")); // NOI18N org.openide.awt.Mnemonics.setLocalizedText(targetLanguageLabel, org.openide.util.NbBundle.getMessage(GoogleTranslatorSettingsPanel.class, "GoogleTranslatorSettingsPanel.targetLanguageLabel.text")); // NOI18N
warningLabel.setForeground(new java.awt.Color(255, 0, 0)); warningLabel.setForeground(new java.awt.Color(255, 0, 0));
org.openide.awt.Mnemonics.setLocalizedText(warningLabel, org.openide.util.NbBundle.getMessage(GoogleTranslatorSettingsPanel.class, "GoogleTranslatorSettingsPanel.warningLabel.text")); // NOI18N org.openide.awt.Mnemonics.setLocalizedText(warningLabel, org.openide.util.NbBundle.getMessage(GoogleTranslatorSettingsPanel.class, "GoogleTranslatorSettingsPanel.warningLabel.text")); // NOI18N
@ -198,7 +199,7 @@ public class GoogleTranslatorSettingsPanel extends javax.swing.JPanel {
.addGroup(layout.createSequentialGroup() .addGroup(layout.createSequentialGroup()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
.addComponent(credentialsLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(credentialsLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(jLabel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addComponent(targetLanguageLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup() .addGroup(layout.createSequentialGroup()
@ -220,7 +221,7 @@ public class GoogleTranslatorSettingsPanel extends javax.swing.JPanel {
.addComponent(browseButton)) .addComponent(browseButton))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(jLabel1) .addComponent(targetLanguageLabel)
.addComponent(targetLanguageComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addComponent(targetLanguageComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(warningLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 18, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(warningLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 18, javax.swing.GroupLayout.PREFERRED_SIZE)
@ -252,8 +253,8 @@ public class GoogleTranslatorSettingsPanel extends javax.swing.JPanel {
private javax.swing.JButton browseButton; private javax.swing.JButton browseButton;
private javax.swing.JLabel credentialsLabel; private javax.swing.JLabel credentialsLabel;
private javax.swing.JTextField credentialsPathField; private javax.swing.JTextField credentialsPathField;
private javax.swing.JLabel jLabel1;
private javax.swing.JComboBox<org.sleuthkit.autopsy.texttranslation.translators.GoogleLanguageWrapper> targetLanguageComboBox; private javax.swing.JComboBox<org.sleuthkit.autopsy.texttranslation.translators.GoogleLanguageWrapper> targetLanguageComboBox;
private javax.swing.JLabel targetLanguageLabel;
private javax.swing.JLabel warningLabel; private javax.swing.JLabel warningLabel;
// End of variables declaration//GEN-END:variables // End of variables declaration//GEN-END:variables

3
Core/test/unit/src/org/sleuthkit/autopsy/texttranslation/translators/GoogleTranslatorTest.java
View File

@ -20,6 +20,9 @@ package org.sleuthkit.autopsy.texttranslation.translators;
import org.junit.Test; import org.junit.Test;
/**
* Tests for the GoogleTranslator
*/
public class GoogleTranslatorTest { public class GoogleTranslatorTest {
/** /**