From 31228ffa600853bc8378dfd5fc0bf7c20dd7063e Mon Sep 17 00:00:00 2001 From: Sophie Mori Date: Fri, 16 Sep 2016 17:06:18 -0400 Subject: [PATCH] Added licenses and an appropriate icon for the options panel --- .../autopsy/directorytree/AddRuleDialog.java | 19 +++++++++++++--- .../autopsy/directorytree/AddRulePanel.java | 19 +++++++++++++--- .../directorytree/ExternalViewerAction.java | 10 ++++----- .../ExternalViewerGlobalSettingsPanel.java | 19 +++++++++++++--- .../ExternalViewerOptionsPanelController.java | 21 ++++++++++++++---- .../directorytree/ExternalViewerRule.java | 19 +++++++++++++--- .../ExternalViewerRulesManager.java | 19 +++++++++++++--- .../external-viewer-rules-32x32.png | Bin 0 -> 821 bytes 8 files changed, 102 insertions(+), 24 deletions(-) create mode 100755 Core/src/org/sleuthkit/autopsy/directorytree/external-viewer-rules-32x32.png diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/AddRuleDialog.java b/Core/src/org/sleuthkit/autopsy/directorytree/AddRuleDialog.java index 037860f2df..d867fc3813 100755 --- a/Core/src/org/sleuthkit/autopsy/directorytree/AddRuleDialog.java +++ b/Core/src/org/sleuthkit/autopsy/directorytree/AddRuleDialog.java @@ -1,7 +1,20 @@ /* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. + * Autopsy Forensic Browser + * + * Copyright 2011-2016 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.directorytree; diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/AddRulePanel.java b/Core/src/org/sleuthkit/autopsy/directorytree/AddRulePanel.java index 85bb82a6d0..c7655d0d53 100755 --- a/Core/src/org/sleuthkit/autopsy/directorytree/AddRulePanel.java +++ b/Core/src/org/sleuthkit/autopsy/directorytree/AddRulePanel.java @@ -1,7 +1,20 @@ /* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. + * Autopsy Forensic Browser + * + * Copyright 2011-2016 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.directorytree; diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/ExternalViewerAction.java b/Core/src/org/sleuthkit/autopsy/directorytree/ExternalViewerAction.java index 256d212969..8149998ca0 100644 --- a/Core/src/org/sleuthkit/autopsy/directorytree/ExternalViewerAction.java +++ b/Core/src/org/sleuthkit/autopsy/directorytree/ExternalViewerAction.java @@ -1,15 +1,15 @@ /* * Autopsy Forensic Browser - * - * Copyright 2011-2014 Basis Technology Corp. + * + * Copyright 2011-2016 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. diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/ExternalViewerGlobalSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/directorytree/ExternalViewerGlobalSettingsPanel.java index 1abf9c18f9..48357aa769 100755 --- a/Core/src/org/sleuthkit/autopsy/directorytree/ExternalViewerGlobalSettingsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/directorytree/ExternalViewerGlobalSettingsPanel.java @@ -1,7 +1,20 @@ /* -* To change this license header, choose License Headers in Project Properties. -* To change this template file, choose Tools | Templates -* and open the template in the editor. + * Autopsy Forensic Browser + * + * Copyright 2011-2016 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.directorytree; diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/ExternalViewerOptionsPanelController.java b/Core/src/org/sleuthkit/autopsy/directorytree/ExternalViewerOptionsPanelController.java index 0bcb0e7772..b351192af3 100755 --- a/Core/src/org/sleuthkit/autopsy/directorytree/ExternalViewerOptionsPanelController.java +++ b/Core/src/org/sleuthkit/autopsy/directorytree/ExternalViewerOptionsPanelController.java @@ -1,7 +1,20 @@ /* -* To change this license header, choose License Headers in Project Properties. -* To change this template file, choose Tools | Templates -* and open the template in the editor. + * Autopsy Forensic Browser + * + * Copyright 2011-2016 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.directorytree; @@ -18,7 +31,7 @@ import org.openide.util.Lookup; */ @OptionsPanelController.TopLevelRegistration( categoryName = "#OptionsCategory_Name_ExternalViewer", - iconBase = "org/sleuthkit/autopsy/modules/filetypeid/user-defined-file-types-settings.png", + iconBase = "org/sleuthkit/autopsy/directorytree/external-viewer-rules-32x32.png", keywords = "#OptionsCategory_Keywords_ExternalViewer", keywordsCategory = "ExternalViewer", position = 9 diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/ExternalViewerRule.java b/Core/src/org/sleuthkit/autopsy/directorytree/ExternalViewerRule.java index 7934c79274..24b6249e7c 100755 --- a/Core/src/org/sleuthkit/autopsy/directorytree/ExternalViewerRule.java +++ b/Core/src/org/sleuthkit/autopsy/directorytree/ExternalViewerRule.java @@ -1,7 +1,20 @@ /* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. + * Autopsy Forensic Browser + * + * Copyright 2011-2016 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.directorytree; diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/ExternalViewerRulesManager.java b/Core/src/org/sleuthkit/autopsy/directorytree/ExternalViewerRulesManager.java index 60e66665a1..78bf535305 100755 --- a/Core/src/org/sleuthkit/autopsy/directorytree/ExternalViewerRulesManager.java +++ b/Core/src/org/sleuthkit/autopsy/directorytree/ExternalViewerRulesManager.java @@ -1,7 +1,20 @@ /* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. + * Autopsy Forensic Browser + * + * Copyright 2011-2016 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.directorytree; diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/external-viewer-rules-32x32.png b/Core/src/org/sleuthkit/autopsy/directorytree/external-viewer-rules-32x32.png new file mode 100755 index 0000000000000000000000000000000000000000..fa5d1bc5c3311a87273a9a88d6168ac9fc291e88 GIT binary patch literal 821 zcmV-51Iqk~P)HU>V%N>HIFA}~Zq?EHXi`~pUH)DbacsFbKvCRQedR0br-fFhb!t!UyTwiDaO zy?3_bb8&{+v;#fq&1*;Jd!Boq_wH;$DTT9a3Y>8}Cy>IQMx(LD(mfW%Q^M6)d}_5? zJx+iX;{9f``MO*#SLA*autu>^DRp>u91Ppd4iE2t(HDcTXNfDY$b^W%>w|;+oz2a+ zZ`h4bpjaxED!)~!1a zz-FBz*DLey+n0|}tJM-&2HkEKBn52ShS_```9M0ImS&K64LEFIBoWnAW=&AeI1N{W zR09l{;NZ&$IJTV_0S{BM00E*1Se6a*nIjchto@&D3X%m;3Lw~YGJ^?=VlnUUe9M$N zxdQIsi&;CMjZBs)_ss1F;eIErfv^IK6YzFs+Ato^`8JDkiJ~EiDS+c4reuK!Zs;~l zro%)gs0&-5u z0^Cz11<()Ei~@&a1QN1930gp~$b!;`Nq80{p#YA7n34hlNC|-wziM5g|4sn}Lkq&7 z!Dbjnl0~>sU_2gY#48nD^3Z}n+_M0m7nm*qP1DlieQg02d@=R1X_~x(Gnq{6Re+dW zX=GC<6kf5scADP