Project

General

Profile

Activity

From 12/06/2021 to 01/04/2022

01/04/2022

03:17 PM bug #9882 (Resolved): Null argument when deleting description in bulkeditor
Katja Luther wrote:
> The original problem is solved, but there is another issue. The deletion of the description el...
Katja Luther
02:47 PM bug #9895 (Resolved): Multiple representations of the same entity after move of synonym
This is fixed,please review. Katja Luther
02:47 PM Revision cd505f6b (cdmlib): ref #9895: fix MRE when moving synonym to an already open taxon
Katja Luther
02:15 PM Revision 495cf16b (cdmlib): ref #9907: fix missing treeIndex in taxonNodeDto - continue
Katja Luther
01:49 PM bug #9907 (Resolved): NPE when trying to create polytomous key
This should be fixed. Katja Luther
01:44 PM bug #9907: NPE when trying to create polytomous key
This exception is caused by the missing treeIndex in nodeDto. Katja Luther
01:44 PM bug #9907 (Closed): NPE when trying to create polytomous key
mail Murat Erdem Guzel:
We tried to "generate polytomous key" for our group. However, we got the following error m...
Katja Luther
01:48 PM bug #9900 (Resolved): Null values in agent search dialog
This should be fixed. Katja Luther
01:47 PM feature request #9908 (New): Add timeperiod to credits
for further explanation see #9906#note-1 Andreas Müller
01:45 PM Revision 523bd6bc (cdmlib): ref #9907: fix missing treeIndex in taxonNodeDto
Katja Luther
12:21 PM Revision 1cc04f46 (taxeditor): change product version
Katja Luther
11:07 AM Revision 4716220c (taxeditor): minor
Katja Luther
10:22 AM Revision ac1d2808 (taxeditor): minor
Katja Luther
09:52 AM feature request #9906: Implement credits in dataportal
ERS:
eine Frage zur Portal-Gestaltung: im Cichorieae-Portal gibt es auf einzelnen Taxon-Seiten die Kategorie “Cred...
Andreas Müller
09:49 AM feature request #9906 (New): Implement credits in dataportal
Credits are editable in TaxEditor but currently not yet visible in the CDM dataportals. However, in future they will ... Andreas Müller

01/03/2022

10:08 PM bug #9905 (In Progress): Parser is slow for names with authorteams
Andreas Müller
09:58 PM bug #9905 (Closed): Parser is slow for names with authorteams
Probably the reason is that potential deduplication candidates are not found correctly and the list of candidates is ... Andreas Müller
04:48 PM Revision 6c29ac64 (taxeditor): minor
Andreas Müller
04:48 PM Revision 0489e98a (taxeditor): ref #9359 update iiif-apis and javassist version in taxeditor (cont.)
Andreas Müller
03:31 PM Revision bbab5719 (taxeditor): minor
Katja Luther
03:13 PM Revision 3b421286 (taxeditor): revert removing commons.httpclient in rcp.target
Katja Luther
03:04 PM Revision c6e3c294 (cdmlib): ref #9359 update ant version in cdmlib
Andreas Müller
03:01 PM Revision bfa2a878 (taxeditor): ref #9359 update iiif-apis and javassist version in taxeditor
Andreas Müller
02:53 PM Revision 98b42ca6 (cdmlib): minor
Andreas Müller
02:52 PM Revision 3837f479 (cdmlib): ref #9359 update doxia, objenesis, iiif-apis, xom, Saxon-HE and javassist version in cdmlib
Andreas Müller
02:47 PM Revision c311c134 (taxeditor): minor
Andreas Müller
02:47 PM Revision 1fbecc37 (taxeditor): ref #9359 fix junit version in taxeditor.test build.properties
Andreas Müller
02:46 PM Revision 53aa6cb3 (taxeditor): ref #9359 revert httpclient.version to httpcomponents.version in taxeditor
Andreas Müller
02:40 PM Revision 39287958 (cdmlib): ref #9359 update httpcore version in cdmlib
Andreas Müller
02:23 PM Revision f2e2fe71 (taxeditor): ref #9359 fix artifactID for httpcore in taxeditor
Andreas Müller
02:12 PM Revision 797afa38 (taxeditor): ref #9359 update httpclient, httpclient-cache and httpcore version in taxeditor
Andreas Müller
01:54 PM Revision 284634e7 (taxeditor): adapt feature to new version of apache httpcomponents - continue
Katja Luther
01:12 PM Revision 92d78f9c (taxeditor): adapt rcp.target to new version of apache httpcomponents
Katja Luther
12:55 PM Revision 68c6de2c (taxeditor): adapt feature to new version of apache httpcomponents
Katja Luther
12:11 PM Revision 0f130bb7 (taxeditor): revert rename of jre product definition
Katja Luther
11:38 AM Revision 1680ec19 (taxeditor): minor, only test update handler
Katja Luther

12/23/2021

10:52 AM bug #9904 (Closed): NullPointerException (NPE) in ListView with filter name="Stephano"
fixed!
Now the validation errors are visible gain:
![](picture935-1.png)
Andreas Kohlbecker
10:51 AM bug #9904 (Resolved): NullPointerException (NPE) in ListView with filter name="Stephano"
Applied in changeset commit:cdmlib|00e4c79fbb7ae6fa6a5c911072ab1b6e0d8ccd7a. Andreas Kohlbecker
10:46 AM bug #9904: NullPointerException (NPE) in ListView with filter name="Stephano"
and is caused by a validation error ("Inconsistent type designations") in which case the `summaryText` in `Registrat... Andreas Kohlbecker
10:39 AM bug #9904: NullPointerException (NPE) in ListView with filter name="Stephano"
this happens for the registration http://phycobank.org/4680 Andreas Kohlbecker
10:34 AM bug #9904 (Closed): NullPointerException (NPE) in ListView with filter name="Stephano"

~~~
[phycobank] 10:31:11,561 DEBUG [qtp1161667116-25][eu.et.cd.va.pe.AccessRestrictedViewControlBean] - allowing...
Andreas Kohlbecker
10:51 AM Revision 00e4c79f (cdmlib): fix #9904 avoiding null value for RegistrationDT0.summaryTaggedText
Andreas Kohlbecker
10:04 AM Revision 54d7e850 (cdm-vaadin): proper logging instead of system.out
Andreas Kohlbecker
10:03 AM Revision d6a88817 (cdm-vaadin): cleaning up obsolete class
Andreas Kohlbecker

12/22/2021

12:08 AM Revision 8def85fa (taxeditor): update spring version in MANIFEST.MF and build.properties
Andreas Müller
12:01 AM Revision 2b7f1be4 (taxeditor): ref #9359 updating jackson and fop to latest version in taxeditor
Andreas Müller

12/21/2021

11:56 PM Revision 8f7ca08d (taxeditor): ref #9359 updating junit and joda-time to latest version in taxeditor (cont.)
Andreas Müller
11:50 PM Revision c31fcd9c (taxeditor): ref #9359 updating commons-lang3 to latest version in taxeditor (cont.)
Andreas Müller
11:23 PM Revision 594bfa10 (taxeditor): remove dozer from gitattributes
Andreas Müller
11:23 PM Revision 9884d3db (taxeditor): ref #9359 updating junit and joda-time to latest version in taxeditor
Andreas Müller
11:22 PM Revision fd27a29d (cdmlib): ref #9359 updating junit and joda-time to latest version in cdmlib
Andreas Müller
11:08 PM Revision 92605e20 (taxeditor): ref #9359 updating commons-lang3 to latest version in taxeditor
Andreas Müller
11:07 PM Revision e2a36780 (cdmlib): ref #9359 updating commons-lang3 to latest version in cdmlib
Andreas Müller
11:03 PM Revision 6b7f04a6 (taxeditor): ref #9359 updating jackson and fop to latest version in taxeditor
Andreas Müller
11:01 PM Revision 2425ff4f (cdmlib): ref #9359 updating jackson, dozer, fop and guava to latest version in cdmlib
Andreas Müller
10:30 PM Revision 5ba4170a (taxeditor): cleanup pom developer data and ci URL to https
Andreas Müller
10:24 PM Revision 886a4b2e (cdmlib): ref #9359 update spring security OAuth2 to 2.5.1 in cdmlib
Andreas Müller
10:23 PM Revision a623e437 (cdmlib): update organizationURL
Andreas Müller
09:56 PM Revision c6e48a0a (taxeditor): ref #9359 update spring to 4.3.30 in taxeditor and use mvn properties for spring version
Andreas Müller
09:50 PM Revision 46ddc021 (cdmlib): ref #9359 update spring to 4.3.30 in cdmlib
Andreas Müller
09:37 PM Revision 3267b6d8 (taxeditor): cleanup
Andreas Müller
06:36 PM feature request #9903 (Closed): disable common name search in defaults
Andreas Kohlbecker
06:28 PM feature request #9903 (Resolved): disable common name search in defaults
Applied in changeset commit:cdm-dataportal|868cf790da78a99a626c7544a5ef512cdd28e002. Andreas Kohlbecker
06:26 PM feature request #9903 (Closed): disable common name search in defaults
Common Name Suche sollte m.E. auf jeden Fall ausgeschaltet sein per Default. Andreas Kohlbecker
06:28 PM Revision 868cf790 (cdm-dataportal): fix #9903 common name search disabled by default
Andreas Kohlbecker
06:13 PM Revision 058c75f7 (taxeditor): ref #9359 httpcomponents to 4.5.13 and spring-security to 4.2.20 in taxeditor
Andreas Müller
06:12 PM Revision 58cfb4c1 (cdmlib): cleanup
Andreas Müller
06:11 PM Revision 5bda5597 (cdmlib): ref #9359 httpcomponents to 4.5.13 and spring-security to 4.2.20 in cdmlib
Andreas Müller
05:57 PM Revision 9c73e70f (cdmlib): ref #9359 update commons-compress to 1.21
Andreas Müller
05:54 PM Revision 624722d8 (cdm-server): cleanup
Andreas Müller
02:03 PM feature request #9902 (New): Add possibility to clear area filter in advanced search
Request from Davie Merrick: "The place filter works well. Can I suggest there be an option to clear the filter. " Andreas Müller
09:00 AM Revision eee93087 (taxeditor): ref #9900: fix consistent use of abbrev title for authors of nomenclatural reference - continue
Katja Luther

12/20/2021

10:06 AM Revision 2e454d0f (cdm-server): revert usage of DefaultParser/GnuParser()
Andreas Müller

12/19/2021

01:02 AM Revision 847b908a (cdm-server): remove some more PermSize and MaxPermSize
Andreas Müller
12:54 AM Revision b396b65c (cdm-server): Replace deprecated GnuParser by DefaultParser
Andreas Müller
12:53 AM Revision d8a13c97 (cdm-server): cleanup
Andreas Müller

12/17/2021

11:54 PM Revision 3baaf1b2 (cdmlib): ref #9607 remove redundant method in IMediaInfoFactory
Andreas Müller
11:54 PM Revision f37ad6bb (cdmlib): cleanup
Andreas Müller
02:59 PM bug #9901 (In Progress): Remove unique key Media_RightsInfo.rights_id
Andreas Müller
02:59 PM bug #9901 (In Progress): Remove unique key Media_RightsInfo.rights_id
Some DBs still have this key but as rights are reusable now this is not correct.
~~~
ALTER TABLE `Media_RightsInf...
Andreas Müller
01:36 PM Revision d82999cd (taxeditor): ref #9900: fix consistent use of abbrev title for authors of nomenclatural reference
Katja Luther
11:42 AM bug #9900 (Closed): Null values in agent search dialog
mail AM:
schon seit längerem ist mir aufgefallen, dass bei der Anzeige von Personen im Dialog etwas nicht stimmt. ...
Katja Luther

12/16/2021

04:28 PM Revision a9ee539b (cdm-dataportal): Merge tag '5.28.1' into develop
tagging 5.28.1 Andreas Kohlbecker
04:28 PM Revision 5726a297 (cdm-dataportal): Merge branch 'hotfix/5.28.1'
Andreas Kohlbecker
04:28 PM Revision 4f63f56d (cdm-dataportal): diabling WoRMS due to unresolved potential copyright issues
Andreas Kohlbecker
04:26 PM Revision 936c6844 (cdm-dataportal): diabling WoRMS due to unresolved potential copyright issues
Andreas Kohlbecker
01:52 PM Revision 22845878 (cdmlib): fix exception in delete of specimen
Katja Luther
01:17 PM Revision 95fa5b49 (utis-core): updating log4j configuration
Andreas Kohlbecker
01:05 PM Revision a2f52132 (utis-core): replacing all system.err/out to proper logging
Andreas Kohlbecker
11:57 AM Revision a9d074d6 (utis-webapp): ref #9899 updating log4j to latest version >=2.16.0
Andreas Kohlbecker
11:56 AM Revision 02d98cb4 (utis-core): ref #9899 updating log4j to latest version >=2.16.0
Andreas Kohlbecker
11:55 AM Revision bc1fb5b4 (utis-core): gitignore
Andreas Kohlbecker

12/15/2021

11:10 PM Revision c5d04eba (cdmlib-apps): cleanup
Andreas Müller
11:09 PM Revision 32e6bfbb (cdmlib-apps): ref #9607 adapt app-import to new media metadata reading
Andreas Müller
02:31 PM Revision 39026d65 (cdmlib): remove PermSize from cdmlib-remote-webapp launchers
Andreas Müller
02:25 PM Revision 4f5f1a8d (cdmlib): add ExcelSpecimenImportTemplate.xlsx
Andreas Müller

12/14/2021

03:45 PM Revision 81745451 (cdm-dataportal): README: on apache module installation
Andreas Kohlbecker
03:26 PM Revision e3a8d2d7 (cdm-dataportal): README: on /etc/hosts
Andreas Kohlbecker
02:53 PM Revision 2d49e5fc (cdm-dataportal): fixing path in README
Andreas Kohlbecker
02:25 PM Revision 20ea70f7 (utis-webapp): ref #9898 upgrading spring to 4.3.30.RELEASE
Andreas Kohlbecker
02:12 PM Revision 642ac8dd (cdm-dataportal): updating installation doc
Andreas Kohlbecker
01:52 PM Revision b17d9c81 (utis-webapp): ignoring .factorypath
Andreas Kohlbecker
11:36 AM Revision 7cc62e59 (taxeditor): ref #9851: add equinox/p2 to logger configuration
Katja Luther

12/13/2021

03:49 PM Revision 778f90cb (utis-core): ref #9898 updating java code level and maven plugins
Andreas Kohlbecker
03:48 PM Revision ecf8f7fc (taxeditor): minor
Katja Luther
03:48 PM Revision dc877faa (utis-webapp): ref #9898 updating javva code level and maven plugins
Andreas Kohlbecker
03:48 PM task #9898: Update utis projects to jdk 11
as first step we will need to update to jdk 1.8 Andreas Kohlbecker
02:02 PM task #9898 (New): Update utis projects to jdk 11
Andreas Kohlbecker
03:03 PM Revision 041b2db9 (utis-core): ref #9899 updating log4j to latest version >=2.15.0
Andreas Kohlbecker
03:02 PM Revision 26588e67 (utis-webapp): ref #9899 updating log4j to latest version >=2.15.0
Andreas Kohlbecker
11:39 AM Revision 793bb6ac (cdm-server): Revert "remove PermSize and MaxPermSize from launchers and configs"
This reverts commit 47d992391158c22481b5c7e178b8454e95abc4c8. Andreas Müller
11:30 AM Revision 47d99239 (cdm-server): remove PermSize and MaxPermSize from launchers and configs
Andreas Müller

12/10/2021

04:52 PM Revision be14d958 (cdm-dataportal): ref #9897 support for AnnotationDTO class
Andreas Kohlbecker
04:50 PM Revision 53ecdbc6 (cdmlib): ref #9896 adding missing AnnotationDTO class
Andreas Kohlbecker
04:50 PM Revision e3820923 (cdmlib): adding again full ReferenceDTO to SourceDTO as the data portal needs more data
Andreas Kohlbecker
03:22 PM feature request #9896 (Resolved): Add annotations of the complete derivation branch to DerivedUnitDTO and FieldUnitDTO as AnnotationDTO
Applied in changeset commit:cdmlib|c25679bb50510d0b5ff98b617e9a18ba4fec879b. Andreas Kohlbecker
11:33 AM feature request #9896 (Closed): Add annotations of the complete derivation branch to DerivedUnitDTO and FieldUnitDTO as AnnotationDTO
the set of AnnotationDTOs should be added at SpecimenOrObservationBaseDTO
suggested structure of AnnotationDTOs:
...
Andreas Kohlbecker
03:22 PM Revision c25679bb (cdmlib): fix #9896 DerivedUnitDTO with complete set of annotationDTOs
Andreas Kohlbecker
11:39 AM feature request #9897 (New): adapt dataportal methods for transparent usage of Anntoation and AnnotationDTO
AnnotationDTO will be implemented in #9896
Methods to adapt in the data portal:
* cdm_ws_fetch_annotations() - ...
Andreas Kohlbecker
10:13 AM bug #9895 (Closed): Multiple representations of the same entity after move of synonym
This exception appears when moving a synonym to another taxon which is already open and add this synonym to another h... Katja Luther

12/09/2021

11:53 PM bug #2448 (Worksforme): Missing updated by/when (e.g. in PalmWeb)
This is very likely being fixed by #9665 therefore I close ticket. Reopen if something similar is observed in future. Andreas Müller
10:02 PM bug #9649 (Closed): Specimens sometimes have empty titleCache instead of class<UUID>
This issue seems to be fixed with #9665 Andreas Müller
12:17 AM bug #9649 (In Progress): Specimens sometimes have empty titleCache instead of class<UUID>
There are still records in fdac, which is not supported anymore and did not run cache updates.
~~~
SELECT *
F...
Andreas Müller
05:28 PM Revision dc49e27e (cdm-dataportal): adapting test to improved DerivedUnitDTO.summaryLabel
Andreas Kohlbecker
03:06 PM Revision e198e1a9 (cdm-dataportal): php doc
Andreas Kohlbecker
03:04 PM Revision 9ba6f6a5 (cdmlib): using the derivedUnit.titleCache as DerivedUnitDTO.summaryLabel
Andreas Kohlbecker
01:33 PM bug #9851: Problems during search for updates when network delay is too big
Found a possibility to increase the timeout for equinox:
https://wiki.eclipse.org/Equinox/p2/TransportDebugging
...
Katja Luther
11:35 AM Revision 95d95003 (taxeditor): ref #9851: log only update handler - minor
Katja Luther
11:09 AM Revision 0c4e1698 (taxeditor): ref #9851: log only update handler - continue
Katja Luther
11:07 AM Revision 934cad1f (taxeditor): ref #9851: change logger in UpdateHandler - continue
Katja Luther
10:50 AM Revision 365140b4 (taxeditor): ref #9851: change logger in UpdateHandler
Katja Luther
10:30 AM Revision c9aeb938 (taxeditor): ref #9851: change logging - continue
Katja Luther
10:26 AM bug #7342 (Worksforme): incomplete bean initialization with specific data causes LIEs
Andreas Kohlbecker
10:24 AM task #2250 (New): TODO use AbstractPagerImpl.hasResultsInRange() where possible
Andreas Müller wrote:
> Is this still an open issue?
yepp!
Andreas Kohlbecker
10:23 AM feature request #9884: Vaadin UI-disabled reporting
the message dialog does not yet appear for all UIs ( e.g.: http://test.e-taxonomy.eu/cdmserver/phycobank/app/distribu... Andreas Kohlbecker
09:28 AM Revision cdf554b8 (taxeditor): ref #9851: change logging
Katja Luther

12/08/2021

11:06 PM bug #2449: Some or many names have an empty fullTitleCache though information is atomized
Also the 2 examples from the description are handled correctly in the meanwhile. Andreas Müller
11:05 PM bug #2449 (In Progress): Some or many names have an empty fullTitleCache though information is atomized
Also Algaterra was saved correctly when the name was explicitly stored differently and then changed back.
Only rem...
Andreas Müller
10:52 PM bug #2449: Some or many names have an empty fullTitleCache though information is atomized
An empty fullTitleCache with atomized data was not found anywhere. Empty fullTitleCaches exist for fully empty data w... Andreas Müller
06:09 PM task #9650: Update all titleCaches after upgrade of cache strategies and formatters
last full cache updates: (e.g. for country labels)
additivity_ontology: 2021-12-09
algaterra_old: 2021-12-08
alg...
Andreas Müller
05:50 PM bug #9892 (Closed): Registration List: type status select in filter options broken
Andreas Kohlbecker
05:50 PM bug #9892 (Resolved): Registration List: type status select in filter options broken
Applied in changeset commit:cdm-vaadin|cfe33fb8b0f01d160647015e4d373d8674f7fffd. Andreas Kohlbecker
05:50 PM Revision cfe33fb8 (cdm-vaadin): fix #9892 solving broken height of type status mutiselect and turning RegistrationSearchFilter into proper java bean
Andreas Kohlbecker
05:11 PM bug #9856 (Closed): Cancel of taxon selection in move synonym results in exception
Works as expected and code ok. Andreas Müller
05:07 PM bug #9857 (Closed): TitleCache field of collector in specimen dialog should show collector title
Works as expected. Andreas Müller
04:49 PM feature request #9894 (Closed): Make primary collector editable for field unit
FieldUnit has a field primaryCollector of type Person. This seems not to be editalbe in the FieldUnit details view ye... Andreas Müller
04:41 PM bug #9881 (Closed): Newly created collector team is not shown in selection dialog
Seems to work as expected. Andreas Müller
04:09 PM bug #9893 (Closed): Name in source not shown
This works for me and also code looks ok so I think it can be closed. Andreas Müller
09:43 AM bug #9893 (Resolved): Name in source not shown
Applied in changeset commit:taxeditor|701f467031a7950db4b5cde8d6c5a10127898cc0. Katja Luther
09:21 AM bug #9893 (Closed): Name in source not shown
mail AM:
Hier gibt es eigentlich einen Name in Source „Vinca maior“, der aber nicht angezeigt wird.
Das Problem s...
Katja Luther
03:57 PM Revision a75a276d (taxeditor): typography in README
Andreas Kohlbecker
03:53 PM Revision 94c9a8c8 (taxeditor): cleaning up dev-linked-projects folder, adding README and doc for project-setup-wire-locally.sh
Andreas Kohlbecker
03:14 PM Revision 835e8eaf (taxeditor): Merge branch 'hotfix/5.28.1'
jenkins
02:29 PM Revision 4884e7f6 (taxeditor): minor for update problems
Katja Luther
10:05 AM Revision 713ed94d (taxeditor): fix #9893: fix the not shown content of descriptionelementsources
Katja Luther
09:48 AM Revision d4bd0b54 (taxeditor): Updated version in pom / project files to taxeditor version : 5.28.1 and cdmlib version : 5.28.0
jenkins
09:43 AM Revision 701f4670 (taxeditor): fix #9893: fix the not shown content of descriptionelementsources
Katja Luther

12/07/2021

03:30 PM bug #9878: show MediaSpecimen media source citations in registration items
please can you review this ticket? Only the vaadin part is relevant. Andreas Kohlbecker
03:25 PM bug #9892: Registration List: type status select in filter options broken
only one option is shown: "- unknown -" Andreas Kohlbecker
03:24 PM bug #9892 (Closed): Registration List: type status select in filter options broken
only one option is shown: "- unknown -" Andreas Kohlbecker
10:22 AM Revision 786a7418 (taxeditor): ref #9861: do not show values when not applicable - continue
Katja Luther

12/06/2021

05:17 PM Revision a650c2c1 (cdm-vaadin): ref #9498 providing feedback to users in case an unknown email has been entered
Andreas Kohlbecker
05:17 PM Revision 0e53a8de (cdmlib): ref #6161 improving method timing for callers & reporting reporting email not found
Andreas Kohlbecker
05:15 PM Revision 7c3a1444 (cdmlib): ref #6161 improving method timing for callers
Andreas Kohlbecker
04:27 PM Revision 642d1a82 (cdm-vaadin): ref #9859 ref #9877 adding Referrer-Policy: no-referrer HTTP header to prevent from Cross-domain Referer leakage
Andreas Kohlbecker
03:38 PM Revision 994d3b34 (cdm-vaadin): ref #9877 fixing readonly bug in AccountRegistrationPresenter
Andreas Kohlbecker
02:39 PM Revision be6d7785 (taxeditor): ref #9861: do not show values when not applicable
Katja Luther
12:56 PM bug #9861: Provide possibility to set a field as inapplicable
Norbert Kilian wrote
> Felder ausgrauen: ja und zugleich mit einem Wert wie "n.a." (= not applicable) füllen, damit ...
Katja Luther
10:12 AM Revision 8cbae4a4 (taxeditor): ref #9861: adapt tooltip text
Katja Luther
09:06 AM Revision 33523822 (taxeditor): ref #9861: smaller changes to fit the logic of inapplicable and only applicable
Katja Luther
 

Also available in: Atom