Cherian Mathew [Thu, 8 Oct 2015 10:44:55 +0000 (12:44 +0200)]
Add load capability for MergeResult objects
Cherian Mathew [Thu, 8 Oct 2015 09:12:39 +0000 (11:12 +0200)]
Update root entity merge calls to use new merge method.
Katja Luther [Thu, 8 Oct 2015 10:31:58 +0000 (12:31 +0200)]
minor
Katja Luther [Thu, 8 Oct 2015 08:38:55 +0000 (10:38 +0200)]
Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop
Katja Luther [Thu, 8 Oct 2015 08:38:05 +0000 (10:38 +0200)]
#5114 fix
Patrick Plitzner [Wed, 7 Oct 2015 15:29:59 +0000 (17:29 +0200)]
Use convenience method for associated taxa
Katja Luther [Wed, 7 Oct 2015 12:14:43 +0000 (14:14 +0200)]
new ErrorDialog for delete result messaging
Katja Luther [Wed, 7 Oct 2015 12:13:48 +0000 (14:13 +0200)]
improve messaging for deleteresults
Katja Luther [Wed, 7 Oct 2015 10:34:54 +0000 (12:34 +0200)]
minor
Katja Luther [Wed, 7 Oct 2015 10:31:53 +0000 (12:31 +0200)]
check for isdeletable before set delete button disabled
Patrick Plitzner [Tue, 6 Oct 2015 13:50:16 +0000 (15:50 +0200)]
I18n of login and data source view
Patrick Plitzner [Tue, 6 Oct 2015 12:41:54 +0000 (14:41 +0200)]
Fix potential NPE
Patrick Plitzner [Tue, 6 Oct 2015 12:06:34 +0000 (14:06 +0200)]
Fix named area filter for selection dialog (#2353)
Katja Luther [Tue, 6 Oct 2015 09:53:15 +0000 (11:53 +0200)]
create new taxonnode with reuse name or taxon now with more consistence enabled/disabled buttons
Katja Luther [Tue, 6 Oct 2015 09:48:42 +0000 (11:48 +0200)]
minor
Katja Luther [Tue, 6 Oct 2015 09:40:05 +0000 (11:40 +0200)]
minor in TaxonNodeDetailElement
Katja Luther [Tue, 6 Oct 2015 09:15:55 +0000 (11:15 +0200)]
Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop
Katja Luther [Tue, 6 Oct 2015 09:15:05 +0000 (11:15 +0200)]
merge branches
U-BGBM\k.luther [Tue, 6 Oct 2015 09:09:44 +0000 (11:09 +0200)]
merge branches
U-BGBM\k.luther [Tue, 6 Oct 2015 08:47:25 +0000 (10:47 +0200)]
minor
Patrick Plitzner [Tue, 6 Oct 2015 07:21:04 +0000 (09:21 +0200)]
Disable expanding of key section (#3461)
Patrick Plitzner [Mon, 5 Oct 2015 13:55:26 +0000 (15:55 +0200)]
Trim code
U-BGBM\k.luther [Tue, 6 Oct 2015 08:58:00 +0000 (10:58 +0200)]
merge
U-BGBM\k.luther [Tue, 6 Oct 2015 08:47:25 +0000 (10:47 +0200)]
minor
U-BGBM\k.luther [Tue, 6 Oct 2015 07:50:09 +0000 (09:50 +0200)]
in a selection element an disabled element can't be deleted so the delete button should be disabled too
Patrick Plitzner [Tue, 6 Oct 2015 07:21:04 +0000 (09:21 +0200)]
Disable expanding of key section (#3461)
U-BGBM\k.luther [Tue, 6 Oct 2015 07:16:50 +0000 (09:16 +0200)]
Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into actualBranch
U-BGBM\k.luther [Tue, 6 Oct 2015 07:16:00 +0000 (09:16 +0200)]
improve messaging for deleteResult
Patrick Plitzner [Mon, 5 Oct 2015 13:55:26 +0000 (15:55 +0200)]
Trim code
Cherian Mathew [Mon, 5 Oct 2015 15:50:00 +0000 (17:50 +0200)]
Change merge to standard call for new taxon node
Cherian Mathew [Mon, 5 Oct 2015 13:05:23 +0000 (15:05 +0200)]
Add check for remoting before setting new entity listener
Patrick Plitzner [Mon, 5 Oct 2015 11:29:08 +0000 (13:29 +0200)]
Add null check to handler (#5283)
Patrick Plitzner [Mon, 5 Oct 2015 11:27:28 +0000 (13:27 +0200)]
Trim code
Patrick Plitzner [Mon, 5 Oct 2015 11:23:24 +0000 (13:23 +0200)]
Add null check to derivate label provider (#5271)
Patrick Plitzner [Mon, 5 Oct 2015 10:58:05 +0000 (12:58 +0200)]
Disable search bar when not connected to CDM store (#3341)
Patrick Plitzner [Mon, 5 Oct 2015 10:46:05 +0000 (12:46 +0200)]
Allow using the search bar only if at least one letter is entered
(#3341)
Patrick Plitzner [Mon, 5 Oct 2015 09:29:19 +0000 (11:29 +0200)]
Disable menu items when not connected to CDM store (#4901)
U-BGBM\k.luther [Mon, 5 Oct 2015 07:38:49 +0000 (09:38 +0200)]
minor
Patrick Plitzner [Fri, 2 Oct 2015 14:49:00 +0000 (16:49 +0200)]
Adapt MediaSpecimen i18n
Patrick Plitzner [Fri, 2 Oct 2015 14:38:42 +0000 (16:38 +0200)]
Fix child hierarchy for DnaSamples
- Fixed adding and displaying of sub derived units like e.g. media
Patrick Plitzner [Fri, 2 Oct 2015 14:25:38 +0000 (16:25 +0200)]
Fix null selection for existing media
Cherian Mathew [Fri, 2 Oct 2015 16:59:14 +0000 (18:59 +0200)]
#5282 Integrate remoting in referencing objects view
Cherian Mathew [Fri, 2 Oct 2015 14:50:50 +0000 (16:50 +0200)]
#5301 Fix null session issues, Add remoting session for feature tree editor
Patrick Plitzner [Fri, 2 Oct 2015 13:47:43 +0000 (15:47 +0200)]
Adapt transient services
Cherian Mathew [Fri, 2 Oct 2015 11:38:44 +0000 (13:38 +0200)]
Change null session to singleton with no owner
Cherian Mathew [Fri, 2 Oct 2015 09:24:48 +0000 (11:24 +0200)]
Update transient services with new merge method
Cherian Mathew [Fri, 2 Oct 2015 08:59:08 +0000 (10:59 +0200)]
Add remoting checks for merge, Move to merge call which returns updated transient object
Cherian Mathew [Thu, 1 Oct 2015 15:25:15 +0000 (17:25 +0200)]
#5300 Implement remoting in Alignment Editor
Patrick Plitzner [Thu, 1 Oct 2015 14:11:12 +0000 (16:11 +0200)]
Correct derivative hierarchy context menu label
Cherian Mathew [Thu, 1 Oct 2015 13:14:24 +0000 (15:14 +0200)]
#5299 Handle session caching of new entities
Cherian Mathew [Thu, 1 Oct 2015 12:46:17 +0000 (14:46 +0200)]
#5256 Add workaround for description reference issue
U-BGBM\k.luther [Thu, 1 Oct 2015 09:03:13 +0000 (11:03 +0200)]
minor
U-BGBM\k.luther [Thu, 1 Oct 2015 09:00:46 +0000 (11:00 +0200)]
fixing problem of reusing name for creation of taxon
Patrick Plitzner [Thu, 1 Oct 2015 06:08:28 +0000 (08:08 +0200)]
Pre-select country as named area type for country selection for
specimens (#2353)
Patrick Plitzner [Wed, 30 Sep 2015 15:09:04 +0000 (17:09 +0200)]
Trim code
Cherian Mathew [Wed, 30 Sep 2015 16:56:34 +0000 (18:56 +0200)]
Add check for remoting to decide whether to merge or save
Patrick Plitzner [Wed, 30 Sep 2015 13:43:21 +0000 (15:43 +0200)]
Fix i18n (#5155)
U-BGBM\k.luther [Wed, 30 Sep 2015 11:01:00 +0000 (13:01 +0200)]
Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into actualBranch
U-BGBM\k.luther [Wed, 30 Sep 2015 11:00:06 +0000 (13:00 +0200)]
move descriptions in a service call
Patrick Plitzner [Wed, 30 Sep 2015 10:54:56 +0000 (12:54 +0200)]
Always search for FieldUnits in DerivativeSearchView
Cherian Mathew [Wed, 30 Sep 2015 10:49:08 +0000 (12:49 +0200)]
Add check to ensure merge in editors is performed only in remoting
Cherian Mathew [Tue, 29 Sep 2015 08:34:15 +0000 (10:34 +0200)]
#5291 Disable data change event firing in case of remoting
U-BGBM\k.luther [Mon, 28 Sep 2015 07:58:44 +0000 (09:58 +0200)]
Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into actualBranch
U-BGBM\k.luther [Mon, 28 Sep 2015 07:57:44 +0000 (09:57 +0200)]
minor
Cherian Mathew [Thu, 24 Sep 2015 09:58:01 +0000 (11:58 +0200)]
Add missing properties file for tests
Cherian Mathew [Thu, 24 Sep 2015 09:03:40 +0000 (11:03 +0200)]
#5247 Fix duplicate entity issue for new entities by using the new merge service method which returns the input transient object
Cherian Mathew [Mon, 21 Sep 2015 09:41:03 +0000 (11:41 +0200)]
#5247 Use updated entities
Cherian Mathew [Mon, 21 Sep 2015 09:39:42 +0000 (11:39 +0200)]
#5250 Initial attempt at property paths
U-BGBM\k.luther [Wed, 23 Sep 2015 12:29:31 +0000 (14:29 +0200)]
merge with local branch
U-BGBM\k.luther [Wed, 23 Sep 2015 11:21:17 +0000 (13:21 +0200)]
fix delete of taxon which is in two classifications and has children
Cherian Mathew [Wed, 23 Sep 2015 10:26:26 +0000 (12:26 +0200)]
Remove profile for clean goals to delete cdmlib jars
Cherian Mathew [Tue, 22 Sep 2015 16:44:14 +0000 (18:44 +0200)]
Merge branch 'remoting-4.0' into develop
Conflicts:
eu.etaxonomy.taxeditor.cdmlib/pom.xml
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeSynonymToAcceptedTaxonHandler.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/handler/CreateFieldUnitHandler.java
Patrick Plitzner [Mon, 21 Sep 2015 15:56:03 +0000 (17:56 +0200)]
Sort classifications in dropdown of taxon node selection dialog (#5184)
Patrick Plitzner [Mon, 21 Sep 2015 15:50:25 +0000 (17:50 +0200)]
Pre-select current classification for taxon node selection dialog
(#3462)
Patrick Plitzner [Mon, 21 Sep 2015 15:49:11 +0000 (17:49 +0200)]
Delete unused method
Patrick Plitzner [Mon, 21 Sep 2015 15:14:03 +0000 (17:14 +0200)]
Trim code
Patrick Plitzner [Mon, 21 Sep 2015 15:06:37 +0000 (17:06 +0200)]
Expand polytomous key section #3461
Patrick Plitzner [Mon, 21 Sep 2015 15:04:15 +0000 (17:04 +0200)]
Trim code
Patrick Plitzner [Mon, 21 Sep 2015 14:57:26 +0000 (16:57 +0200)]
Add geoscopes and taxonomic scope as subsection to polytomous key detail
element
Patrick Plitzner [Tue, 22 Sep 2015 06:13:48 +0000 (08:13 +0200)]
Add selection listener to media detail element to allow showing
supplemental data (#3367)
Patrick Plitzner [Tue, 22 Sep 2015 06:10:50 +0000 (08:10 +0200)]
Fix media view selection
Patrick Plitzner [Mon, 21 Sep 2015 13:02:39 +0000 (15:02 +0200)]
Generalized UriWithLabelElement to use super class
Patrick Plitzner [Mon, 21 Sep 2015 12:40:22 +0000 (14:40 +0200)]
Add Lsid text field to taxonname details view
- added generic abstract class for URI text fields
Patrick Plitzner [Mon, 21 Sep 2015 07:57:58 +0000 (09:57 +0200)]
Disable menu "New..." meun entries when no connection available (#4901)
Patrick Plitzner [Mon, 21 Sep 2015 07:44:30 +0000 (09:44 +0200)]
Disable media view when synonym selected (#5195)
Patrick Plitzner [Mon, 21 Sep 2015 07:30:33 +0000 (09:30 +0200)]
I18n for specimen editor (#5155)
Cherian Mathew [Wed, 16 Sep 2015 19:24:25 +0000 (21:24 +0200)]
Fix merge
Cherian Mathew [Wed, 16 Sep 2015 17:51:11 +0000 (19:51 +0200)]
Fix versions
Cherian Mathew [Wed, 16 Sep 2015 17:42:52 +0000 (19:42 +0200)]
Fix versions
Cherian Mathew [Wed, 16 Sep 2015 17:19:25 +0000 (19:19 +0200)]
Merge branch 'develop' into remoting-4.0
Conflicts:
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/build.properties
eu.etaxonomy.taxeditor.cdmlib/pom.xml
Cherian Mathew [Wed, 16 Sep 2015 17:14:52 +0000 (19:14 +0200)]
Fix versions
Cherian Mathew [Wed, 16 Sep 2015 17:06:35 +0000 (19:06 +0200)]
Set second demo server ip
jenkins [Wed, 16 Sep 2015 16:28:06 +0000 (18:28 +0200)]
Revert project versions to 3.11.0-SNAPSHOT
jenkins [Wed, 16 Sep 2015 16:27:11 +0000 (18:27 +0200)]
Updated version in pom / project files to taxeditor version : 3.12.0-SNAPSHOT and cdmlib version : 3.12.0-SNAPSHOT
Cherian Mathew [Wed, 16 Sep 2015 13:54:01 +0000 (15:54 +0200)]
Fix for cdmlib version numbers
Patrick Plitzner [Wed, 16 Sep 2015 13:22:51 +0000 (15:22 +0200)]
Fix label consistency #5133
Patrick Plitzner [Tue, 15 Sep 2015 14:03:30 +0000 (16:03 +0200)]
Add i18n to binary build path
Cherian Mathew [Wed, 16 Sep 2015 13:01:54 +0000 (15:01 +0200)]
Cache the default feature tree
Cherian Mathew [Wed, 16 Sep 2015 12:59:59 +0000 (14:59 +0200)]
#5259 initialising default ranks
Cherian Mathew [Tue, 15 Sep 2015 19:01:23 +0000 (21:01 +0200)]
Update test versions