diff --git a/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonAttributePanel.form b/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonAttributePanel.form index 3c712368ef..02353d8835 100644 --- a/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonAttributePanel.form +++ b/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonAttributePanel.form @@ -58,7 +58,7 @@ - + @@ -77,7 +77,7 @@ - + diff --git a/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonAttributePanel.java b/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonAttributePanel.java index f73eaf020f..9ad914a468 100644 --- a/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonAttributePanel.java +++ b/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonAttributePanel.java @@ -18,6 +18,8 @@ */ package org.sleuthkit.autopsy.commonfilesearch; +import org.sleuthkit.autopsy.guiutils.DataSourceComboBoxModel; +import org.sleuthkit.autopsy.guiutils.DataSourceLoader; import java.awt.Dimension; import java.sql.SQLException; import java.util.ArrayList; diff --git a/Core/src/org/sleuthkit/autopsy/commonfilesearch/InterCasePanel.java b/Core/src/org/sleuthkit/autopsy/commonfilesearch/InterCasePanel.java index 22454979fb..2cb94571ae 100644 --- a/Core/src/org/sleuthkit/autopsy/commonfilesearch/InterCasePanel.java +++ b/Core/src/org/sleuthkit/autopsy/commonfilesearch/InterCasePanel.java @@ -19,6 +19,7 @@ */ package org.sleuthkit.autopsy.commonfilesearch; +import org.sleuthkit.autopsy.guiutils.DataSourceComboBoxModel; import java.util.Collections; import java.util.HashMap; import java.util.List; diff --git a/Core/src/org/sleuthkit/autopsy/commonfilesearch/IntraCasePanel.java b/Core/src/org/sleuthkit/autopsy/commonfilesearch/IntraCasePanel.java index 4841d39e84..fd8f9becac 100644 --- a/Core/src/org/sleuthkit/autopsy/commonfilesearch/IntraCasePanel.java +++ b/Core/src/org/sleuthkit/autopsy/commonfilesearch/IntraCasePanel.java @@ -19,6 +19,7 @@ */ package org.sleuthkit.autopsy.commonfilesearch; +import org.sleuthkit.autopsy.guiutils.DataSourceComboBoxModel; import java.util.Collections; import java.util.HashMap; import java.util.Map; diff --git a/Core/src/org/sleuthkit/autopsy/commonfilesearch/DataSourceComboBoxModel.java b/Core/src/org/sleuthkit/autopsy/guiutils/DataSourceComboBoxModel.java similarity index 95% rename from Core/src/org/sleuthkit/autopsy/commonfilesearch/DataSourceComboBoxModel.java rename to Core/src/org/sleuthkit/autopsy/guiutils/DataSourceComboBoxModel.java index 1b55e6bdc3..cece351758 100644 --- a/Core/src/org/sleuthkit/autopsy/commonfilesearch/DataSourceComboBoxModel.java +++ b/Core/src/org/sleuthkit/autopsy/guiutils/DataSourceComboBoxModel.java @@ -17,7 +17,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.commonfilesearch; +package org.sleuthkit.autopsy.guiutils; import javax.swing.AbstractListModel; import javax.swing.ComboBoxModel; @@ -44,7 +44,7 @@ public class DataSourceComboBoxModel extends AbstractListModel implement * * @param theDataSoureList names of data sources for user to pick from */ - DataSourceComboBoxModel(String... theDataSoureList) { + public DataSourceComboBoxModel(String... theDataSoureList) { dataSourceList = theDataSoureList.clone(); } diff --git a/Core/src/org/sleuthkit/autopsy/commonfilesearch/DataSourceLoader.java b/Core/src/org/sleuthkit/autopsy/guiutils/DataSourceLoader.java similarity index 98% rename from Core/src/org/sleuthkit/autopsy/commonfilesearch/DataSourceLoader.java rename to Core/src/org/sleuthkit/autopsy/guiutils/DataSourceLoader.java index 69af771dad..deb333780a 100644 --- a/Core/src/org/sleuthkit/autopsy/commonfilesearch/DataSourceLoader.java +++ b/Core/src/org/sleuthkit/autopsy/guiutils/DataSourceLoader.java @@ -17,7 +17,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.commonfilesearch; +package org.sleuthkit.autopsy.guiutils; import java.io.File; import java.sql.ResultSet; diff --git a/Core/src/org/sleuthkit/autopsy/modules/case_uco/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/modules/case_uco/Bundle_ja.properties deleted file mode 100755 index 1204a1e9dc..0000000000 --- a/Core/src/org/sleuthkit/autopsy/modules/case_uco/Bundle_ja.properties +++ /dev/null @@ -1,2 +0,0 @@ - -ReportCaseUcoConfigPanel.jLabelSelectDataSource.text=STIX\u30d5\u30a1\u30a4\u30eb\u307e\u305f\u306fSTIX\u30d5\u30a1\u30a4\u30eb\u306e\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3092\u9078\u629e diff --git a/Core/src/org/sleuthkit/autopsy/modules/case_uco/DataSourceComboBoxModel.java b/Core/src/org/sleuthkit/autopsy/modules/case_uco/DataSourceComboBoxModel.java deleted file mode 100755 index 48dd3eab1b..0000000000 --- a/Core/src/org/sleuthkit/autopsy/modules/case_uco/DataSourceComboBoxModel.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * - * Autopsy Forensic Browser - * - * Copyright 2018 Basis Technology Corp. - * Contact: carrier sleuthkit org - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.sleuthkit.autopsy.modules.case_uco; - -import javax.swing.AbstractListModel; -import javax.swing.ComboBoxModel; -import javax.swing.event.ListDataListener; - -/** - * Encapsulates meta data needed to populate the data source selection drop down menu - */ -class DataSourceComboBoxModel extends AbstractListModel implements ComboBoxModel { - - private static final long serialVersionUID = 1L; - private final String[] dataSourceList; - private String selection = null; - - /** - * Use this to initialize the panel - */ - DataSourceComboBoxModel() { - this.dataSourceList = new String[0]; - } - - /** - * Use this when we have data to display. - * - * @param theDataSoureList names of data sources for user to pick from - */ - DataSourceComboBoxModel(String... theDataSoureList) { - dataSourceList = theDataSoureList.clone(); - } - - @Override - public void setSelectedItem(Object anItem) { - selection = (String) anItem; - } - - @Override - public Object getSelectedItem() { - return selection; - } - - @Override - public int getSize() { - return dataSourceList.length; - } - - @Override - public String getElementAt(int index) { - return dataSourceList[index]; - } - - @Override - public void addListDataListener(ListDataListener listener) { - this.listenerList.add(ListDataListener.class, listener); - } - - @Override - public void removeListDataListener(ListDataListener listener) { - this.listenerList.remove(ListDataListener.class, listener); - } -} diff --git a/Core/src/org/sleuthkit/autopsy/modules/case_uco/ReportCaseUcoConfigPanel.java b/Core/src/org/sleuthkit/autopsy/modules/case_uco/ReportCaseUcoConfigPanel.java index 2e2157caf1..d416ede656 100755 --- a/Core/src/org/sleuthkit/autopsy/modules/case_uco/ReportCaseUcoConfigPanel.java +++ b/Core/src/org/sleuthkit/autopsy/modules/case_uco/ReportCaseUcoConfigPanel.java @@ -26,7 +26,8 @@ import java.util.Map.Entry; import javax.swing.ComboBoxModel; import org.openide.util.Exceptions; import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException; -import org.sleuthkit.autopsy.commonfilesearch.DataSourceLoader; +import org.sleuthkit.autopsy.guiutils.DataSourceLoader; +import org.sleuthkit.autopsy.guiutils.DataSourceComboBoxModel; import org.sleuthkit.datamodel.TskCoreException; /**