taxeditor.git
7 years agoCorrect merge
Cherian Mathew [Thu, 3 Sep 2015 15:42:47 +0000 (17:42 +0200)]
Correct merge

7 years agoMerge branch 'develop' into remoting-4.0
Cherian Mathew [Thu, 3 Sep 2015 15:11:32 +0000 (17:11 +0200)]
Merge branch 'develop' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.editor/plugin.xml
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/MultiPageTaxonEditor.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/handler/DeleteHandler.java
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TreeNodeDropAdapterAssistant.java
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/MoveTaxonHandler.java
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/DeleteOperation.java
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/MoveTaxonOperation.java
eu.etaxonomy.taxeditor.store/plugin.xml

7 years ago#5188 Add special for deleting sequence
Cherian Mathew [Thu, 3 Sep 2015 13:37:47 +0000 (15:37 +0200)]
#5188 Add special for deleting sequence

7 years ago#5186 Fix erros in sequence merge and creating new specimen
Cherian Mathew [Thu, 3 Sep 2015 08:17:43 +0000 (10:17 +0200)]
#5186 Fix erros in sequence merge and creating new specimen

7 years agominor
U-BGBM\k.luther [Thu, 3 Sep 2015 10:49:21 +0000 (12:49 +0200)]
minor

7 years agomoving taxonnode with drag & drop as predecessor fixed
U-BGBM\k.luther [Thu, 3 Sep 2015 10:35:48 +0000 (12:35 +0200)]
moving taxonnode with drag & drop as predecessor fixed

7 years ago#5138 Add test for normal Person load case
Cherian Mathew [Thu, 3 Sep 2015 10:09:39 +0000 (12:09 +0200)]
#5138 Add test for normal Person load case

7 years agochange preferences page for taxonnode sort
U-BGBM\k.luther [Thu, 3 Sep 2015 09:57:59 +0000 (11:57 +0200)]
change preferences page for taxonnode sort

7 years agoadapting transient service implementation to changes in cdmlib
Andreas Kohlbecker [Thu, 3 Sep 2015 05:57:04 +0000 (07:57 +0200)]
adapting transient service implementation to changes in cdmlib
  - deprecated method removed

7 years agofixing #5150
U-BGBM\k.luther [Wed, 2 Sep 2015 12:54:03 +0000 (14:54 +0200)]
fixing #5150

7 years agoerror handling in deleteHandler/operation of navigator
U-BGBM\k.luther [Wed, 2 Sep 2015 11:49:31 +0000 (13:49 +0200)]
error handling in deleteHandler/operation of navigator

7 years agobetter messaging when convert person to team does not work
U-BGBM\k.luther [Wed, 2 Sep 2015 10:27:13 +0000 (12:27 +0200)]
better messaging when convert person to team does not work

7 years agoMerge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into actualBranch
U-BGBM\k.luther [Wed, 2 Sep 2015 09:34:32 +0000 (11:34 +0200)]
Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into actualBranch

7 years agomoving more than one taxon node, merge of team and person, reusing name for new taxon
U-BGBM\k.luther [Wed, 2 Sep 2015 09:33:31 +0000 (11:33 +0200)]
moving more than one taxon node, merge of team and person, reusing name for new taxon

7 years agoAdd space to message
Patrick Plitzner [Wed, 2 Sep 2015 09:29:02 +0000 (11:29 +0200)]
Add space to message

7 years ago#5181 Fix incorrect load of CdmServiceCacher when connecting via Datasource view
Cherian Mathew [Wed, 2 Sep 2015 09:03:19 +0000 (11:03 +0200)]
#5181 Fix incorrect load of CdmServiceCacher when connecting via Datasource view

7 years agoIgnoring test until #5138 is fixed
Cherian Mathew [Tue, 1 Sep 2015 15:45:47 +0000 (17:45 +0200)]
Ignoring test until #5138 is fixed

7 years agoMerge remote-tracking branch 'origin' into remoting-4.0
Cherian Mathew [Tue, 1 Sep 2015 15:27:53 +0000 (17:27 +0200)]
Merge remote-tracking branch 'origin' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.application/pom.xml
eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.bulkeditor/pom.xml
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/pom.xml
eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.editor/pom.xml
eu.etaxonomy.taxeditor.feature.platform/feature.xml
eu.etaxonomy.taxeditor.feature.platform/pom.xml
eu.etaxonomy.taxeditor.feature/feature.xml
eu.etaxonomy.taxeditor.feature/pom.xml
eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.help/pom.xml
eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.navigation/pom.xml
eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.printpublisher/pom.xml
eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.store/pom.xml
eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
eu.etaxonomy.taxeditor/pom.xml
pom.xml

7 years ago#5138 Add test for cascade error
Cherian Mathew [Tue, 1 Sep 2015 15:23:09 +0000 (17:23 +0200)]
#5138 Add test for cascade error

7 years agoFix NPE
Patrick Plitzner [Tue, 1 Sep 2015 11:42:44 +0000 (13:42 +0200)]
Fix NPE

7 years agoAvoid exception loop when taxon name is null (#4996)
Patrick Plitzner [Tue, 1 Sep 2015 09:15:17 +0000 (11:15 +0200)]
Avoid exception loop when taxon name is null (#4996)

7 years agoDo not show taxon navigator menu entries when nothing is selected
Patrick Plitzner [Tue, 1 Sep 2015 06:38:25 +0000 (08:38 +0200)]
Do not show taxon navigator menu entries when nothing is selected

7 years agoTrim code
Patrick Plitzner [Tue, 1 Sep 2015 08:23:58 +0000 (10:23 +0200)]
Trim code

7 years ago#5009 Fix post polytomous key delete operation event handling
Cherian Mathew [Thu, 27 Aug 2015 16:11:02 +0000 (18:11 +0200)]
#5009 Fix post polytomous key delete operation event handling

7 years ago#5161 Initialize listeners on cdm entities before put in cache
Cherian Mathew [Thu, 27 Aug 2015 14:11:39 +0000 (16:11 +0200)]
#5161 Initialize listeners on cdm entities before put in cache

7 years ago#5161 Fix problem of new entity not refreshed
Cherian Mathew [Tue, 25 Aug 2015 14:54:01 +0000 (16:54 +0200)]
#5161 Fix problem of new entity not refreshed

7 years agoMerge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into actualBranch
U-BGBM\k.luther [Thu, 27 Aug 2015 11:04:41 +0000 (13:04 +0200)]
Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into actualBranch

7 years agofix #5171
U-BGBM\k.luther [Thu, 27 Aug 2015 11:01:06 +0000 (13:01 +0200)]
fix #5171

7 years agoCheck for disposed widget
Cherian Mathew [Wed, 26 Aug 2015 12:54:30 +0000 (14:54 +0200)]
Check for disposed widget

7 years ago#5143, #5144 Improve load performance for name editor
Cherian Mathew [Wed, 26 Aug 2015 12:45:13 +0000 (14:45 +0200)]
#5143, #5144 Improve load performance for name editor

7 years agoMove Base operations test class to right package
Cherian Mathew [Wed, 26 Aug 2015 08:59:56 +0000 (10:59 +0200)]
Move Base operations test class to right package

7 years agoAdd PDE runtime environment to target platform (provides Plug-In Spy)
Patrick Plitzner [Wed, 26 Aug 2015 11:22:59 +0000 (13:22 +0200)]
Add PDE runtime environment to target platform (provides Plug-In Spy)

7 years agoMerge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into actualBranch
U-BGBM\k.luther [Wed, 26 Aug 2015 10:30:07 +0000 (12:30 +0200)]
Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into actualBranch

7 years agoclose the polytomouskey-editor if the key is deleted
U-BGBM\k.luther [Wed, 26 Aug 2015 10:29:16 +0000 (12:29 +0200)]
close the polytomouskey-editor if the key is deleted

7 years agoMerge branch 'develop' into remoting-4.0
Cherian Mathew [Wed, 26 Aug 2015 09:03:14 +0000 (11:03 +0200)]
Merge branch 'develop' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java

7 years agoDisable MediaView for bulk editor (#5162)
Patrick Plitzner [Wed, 26 Aug 2015 06:15:49 +0000 (08:15 +0200)]
Disable MediaView for bulk editor (#5162)

 - bulk editor does only activate media view when showing taxa
 - code trimming

7 years agoMove property tester to editor plugin
Patrick Plitzner [Tue, 25 Aug 2015 15:42:30 +0000 (17:42 +0200)]
Move property tester to editor plugin

7 years agoReplace deprecated method
Patrick Plitzner [Tue, 25 Aug 2015 15:10:23 +0000 (17:10 +0200)]
Replace deprecated method

7 years agoMerge branch 'develop' into LibrAlign
Patrick Plitzner [Tue, 25 Aug 2015 11:52:07 +0000 (13:52 +0200)]
Merge branch 'develop' into LibrAlign

7 years ago#5160 Use new merge method with ids as arguments attic/branches/taxeditor/develop/25350
Cherian Mathew [Tue, 25 Aug 2015 11:09:07 +0000 (13:09 +0200)]
#5160 Use new merge method with ids as arguments

Conflicts:
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java

7 years ago#5160 Use new merge method with ids as arguments
Cherian Mathew [Tue, 25 Aug 2015 11:09:07 +0000 (13:09 +0200)]
#5160 Use new merge method with ids as arguments

7 years agoMerge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/taxeditor into develop
Patrick Plitzner [Tue, 25 Aug 2015 08:21:25 +0000 (10:21 +0200)]
Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/taxeditor into develop

7 years agofix #5153
U-BGBM\k.luther [Tue, 25 Aug 2015 07:50:28 +0000 (09:50 +0200)]
fix #5153

7 years agofix #5153
U-BGBM\k.luther [Tue, 25 Aug 2015 07:50:28 +0000 (09:50 +0200)]
fix #5153

7 years agoExternalize Strings
Patrick Plitzner [Tue, 25 Aug 2015 06:36:27 +0000 (08:36 +0200)]
Externalize Strings

7 years agoMerge develop into branch
Patrick Plitzner [Tue, 25 Aug 2015 06:22:23 +0000 (08:22 +0200)]
Merge develop into branch

7 years agoChange order of controls
Patrick Plitzner [Tue, 25 Aug 2015 06:15:20 +0000 (08:15 +0200)]
Change order of controls

7 years agoUse web icon for URL button
Patrick Plitzner [Tue, 25 Aug 2015 06:06:59 +0000 (08:06 +0200)]
Use web icon for URL button

7 years agoCreate constant for default column number in detail sections
Patrick Plitzner [Tue, 25 Aug 2015 06:06:12 +0000 (08:06 +0200)]
Create constant for default column number in detail sections

7 years agoSplit up control creation of TextWithLabelElement
Patrick Plitzner [Tue, 25 Aug 2015 06:05:51 +0000 (08:05 +0200)]
Split up control creation of TextWithLabelElement

 - this fixes layout problems when inserting a separate button for
opening links

7 years agoTrim code
Patrick Plitzner [Mon, 24 Aug 2015 17:44:19 +0000 (19:44 +0200)]
Trim code

7 years agoRemove equal width from columns
Patrick Plitzner [Mon, 24 Aug 2015 17:43:49 +0000 (19:43 +0200)]
Remove equal width from columns

7 years agoTest implementation of Copy action added to AlignmentEditor.
b.stoever [Mon, 24 Aug 2015 16:57:35 +0000 (16:57 +0000)]
Test implementation of Copy action added to AlignmentEditor.

7 years agoCorrect properties file load and server info test
Cherian Mathew [Mon, 24 Aug 2015 15:17:55 +0000 (17:17 +0200)]
Correct properties file load and server info test

7 years agoAdd entity type to CdmChangeEvent and fixes #5139
Cherian Mathew [Mon, 24 Aug 2015 12:33:09 +0000 (14:33 +0200)]
Add entity type to CdmChangeEvent and fixes #5139

7 years agoExternalize strings
Patrick Plitzner [Mon, 24 Aug 2015 11:02:50 +0000 (13:02 +0200)]
Externalize strings

7 years ago#4073 Initial implementation of local cdm-server
Cherian Mathew [Mon, 24 Aug 2015 09:13:33 +0000 (11:13 +0200)]
#4073 Initial implementation of local cdm-server

7 years agoMerge branch 'develop' into remoting-4.0
Cherian Mathew [Mon, 24 Aug 2015 09:34:25 +0000 (11:34 +0200)]
Merge branch 'develop' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/FeatureDistributionDetailElement.java

7 years agoWarn user that URL will not be saved in bold and red (#5065, #5141)
Patrick Plitzner [Mon, 24 Aug 2015 09:11:08 +0000 (11:11 +0200)]
Warn user that URL will not be saved in bold and red (#5065, #5141)

7 years agoAdd OS and java info to MessagingUtils stacktrace
Patrick Plitzner [Wed, 19 Aug 2015 15:22:27 +0000 (17:22 +0200)]
Add OS and java info to MessagingUtils stacktrace

7 years agoChange order parameters in DetailsView for sources (#5133)
Patrick Plitzner [Wed, 19 Aug 2015 15:45:32 +0000 (17:45 +0200)]
Change order parameters in DetailsView for sources (#5133)

7 years agoSupport UUID search in bulk editors (#5103)
Patrick Plitzner [Mon, 24 Aug 2015 08:29:14 +0000 (10:29 +0200)]
Support UUID search in bulk editors (#5103)

7 years agoTrim code
Patrick Plitzner [Mon, 24 Aug 2015 05:10:32 +0000 (07:10 +0200)]
Trim code

7 years agoRemove comments
Patrick Plitzner [Mon, 24 Aug 2015 05:01:43 +0000 (07:01 +0200)]
Remove comments

7 years agoHandle ampersand correctly in section titles (#5142)
Patrick Plitzner [Mon, 24 Aug 2015 05:00:42 +0000 (07:00 +0200)]
Handle ampersand correctly in section titles (#5142)

7 years agoFix application ID
Patrick Plitzner [Mon, 24 Aug 2015 08:35:20 +0000 (10:35 +0200)]
Fix application ID

7 years ago#4717 Correct java exec called for macosx
Cherian Mathew [Fri, 21 Aug 2015 08:15:25 +0000 (10:15 +0200)]
#4717 Correct java exec called for macosx

7 years ago#4717 Correct macosx dir structure
Cherian Mathew [Fri, 21 Aug 2015 06:46:06 +0000 (08:46 +0200)]
#4717 Correct macosx dir structure

7 years ago#4717 Correct macosx java path
Cherian Mathew [Thu, 20 Aug 2015 16:59:44 +0000 (18:59 +0200)]
#4717 Correct macosx java path

7 years ago#4717 Correct dir relative path to java exec for mac osx
Cherian Mathew [Thu, 20 Aug 2015 16:27:40 +0000 (18:27 +0200)]
#4717 Correct dir relative path to java exec for mac osx

7 years ago#4717 Correct dir for changing permissions
Cherian Mathew [Thu, 20 Aug 2015 15:52:36 +0000 (17:52 +0200)]
#4717 Correct dir for changing permissions

7 years ago#4717 Add seperate product file for jre bundle
Cherian Mathew [Thu, 20 Aug 2015 15:46:55 +0000 (17:46 +0200)]
#4717 Add seperate product file for jre bundle

7 years agofix for #5114
U-BGBM\k.luther [Thu, 20 Aug 2015 08:37:27 +0000 (10:37 +0200)]
fix for #5114

7 years agofix #5153
U-BGBM\k.luther [Thu, 20 Aug 2015 08:37:27 +0000 (10:37 +0200)]
fix #5153

7 years agoMerge branch 'hotfix/3.7.1' root/tags/taxeditor/3.7.1 3.7.1
jenkins [Tue, 18 Aug 2015 14:17:49 +0000 (16:17 +0200)]
Merge branch 'hotfix/3.7.1'

7 years agoupdating poms for branch'hotfix/3.7.1' with non-snapshot versions
jenkins [Tue, 18 Aug 2015 14:14:44 +0000 (16:14 +0200)]
updating poms for branch'hotfix/3.7.1' with non-snapshot versions

7 years agoRevert project versions to 3.7.1-SNAPSHOT
jenkins [Tue, 18 Aug 2015 14:13:45 +0000 (16:13 +0200)]
Revert project versions to 3.7.1-SNAPSHOT

7 years agoUpdated version in pom / project files to taxeditor version : 3.7.1 and cdmlib version :
jenkins [Tue, 18 Aug 2015 14:12:34 +0000 (16:12 +0200)]
Updated version in pom / project files to taxeditor version : 3.7.1 and cdmlib version :

7 years agochanges for move descriptions and description elements
U-BGBM\k.luther [Tue, 18 Aug 2015 11:40:45 +0000 (13:40 +0200)]
changes for move descriptions and description elements

7 years agoUpdated version in pom / project files to taxeditor version : 3.7.1-SNAPSHOT and...
jenkins [Tue, 18 Aug 2015 14:10:24 +0000 (16:10 +0200)]
Updated version in pom / project files to taxeditor version : 3.7.1-SNAPSHOT and cdmlib version :

7 years agoupdating poms for 3.7.1 branch with snapshot versions
jenkins [Tue, 18 Aug 2015 14:09:21 +0000 (16:09 +0200)]
updating poms for 3.7.1 branch with snapshot versions

7 years agoMerge branch 'develop' into LibrAlign
Patrick Plitzner [Tue, 18 Aug 2015 12:56:14 +0000 (14:56 +0200)]
Merge branch 'develop' into LibrAlign

7 years agoMerge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/taxeditor into develop
U-BGBM\k.luther [Tue, 18 Aug 2015 12:45:59 +0000 (14:45 +0200)]
Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/taxeditor into develop

7 years agosmall changes for ideas for better drag and drop in taxonnavigator
U-BGBM\k.luther [Tue, 18 Aug 2015 12:26:04 +0000 (14:26 +0200)]
small changes for ideas for better drag and drop in taxonnavigator

7 years agowhite spaces
U-BGBM\k.luther [Tue, 18 Aug 2015 12:09:17 +0000 (14:09 +0200)]
white spaces

7 years agoCorrect config for molecular plugin
Cherian Mathew [Tue, 18 Aug 2015 11:47:22 +0000 (13:47 +0200)]
Correct config for molecular plugin

7 years agochanges for move descriptions and description elements
U-BGBM\k.luther [Tue, 18 Aug 2015 11:40:45 +0000 (13:40 +0200)]
changes for move descriptions and description elements

7 years agominor
k.luther [Tue, 18 Aug 2015 11:35:40 +0000 (13:35 +0200)]
minor

7 years agoRemove comments
Patrick Plitzner [Tue, 18 Aug 2015 05:51:57 +0000 (07:51 +0200)]
Remove comments

7 years agoRename Derivative View to Derivative Editor
Patrick Plitzner [Mon, 17 Aug 2015 12:56:21 +0000 (14:56 +0200)]
Rename Derivative View to Derivative Editor

7 years agoMinor changes.
b.stoever [Mon, 17 Aug 2015 10:59:08 +0000 (10:59 +0000)]
Minor changes.

7 years agoFixed NPE when loading single reads without attached pherogram.
b.stoever [Mon, 17 Aug 2015 10:56:22 +0000 (10:56 +0000)]
Fixed NPE when loading single reads without attached pherogram.

7 years agotest commit
Patric Plitzner [Mon, 17 Aug 2015 10:52:38 +0000 (10:52 +0000)]
test commit

7 years agoAdded missing molecular plugin projects
Patrick Plitzner [Mon, 17 Aug 2015 08:38:58 +0000 (10:38 +0200)]
Added missing molecular plugin projects

7 years agowhite space changes
Patrick Plitzner [Mon, 17 Aug 2015 08:19:27 +0000 (10:19 +0200)]
white space changes

7 years agoRenamed branch
Patric Plitzner [Mon, 17 Aug 2015 07:38:29 +0000 (07:38 +0000)]
Renamed branch

7 years agominor
k.luther [Thu, 13 Aug 2015 12:13:04 +0000 (14:13 +0200)]
minor

7 years agominor
k.luther [Thu, 13 Aug 2015 12:12:15 +0000 (14:12 +0200)]
minor

7 years agofix jenkins
k.luther [Thu, 13 Aug 2015 12:09:31 +0000 (14:09 +0200)]
fix jenkins

7 years agofix jenkins
k.luther [Thu, 13 Aug 2015 11:58:56 +0000 (13:58 +0200)]
fix jenkins