cleanup
ref #4611 Restructure string externalization for taxeditor.store
ref #6419 renaming CdmApplicationDefaultConfiguration to CdmRepository
remove comment
fix #6300: the newDerivedUnitWizard should not have a session
fix #5216: merge grantedAuthority checks for existing grantedAuthority first and some other fixes for grantedAuthority handling in editor
ref #6365 use TaxonNameFactory for factory methods in TaxEditor
ref #6362 and ref #6365 remove some NVN and Bot/Zoo name occurrences in TaxEditor
ref #6190 removing svn property place holder in first line of code - java files
fix #5607: add sec reference to property path solves the problem of not reload the right sec reference
fix #5759 remove all switches for remoting and standalone
fix #5607: laoding of parentnode with propertyPaths solves the problem
fix #5869 use the service method to create new taxonnode to avoid multiple representation exception when reuse taxon
#5975 fixed title cache of empty specimens
add nomenclatural author search for team members
Revert some changes to allow compilation. Needs to be fixed ASAP
Fix order of wizard pages in new taxon wizard #2402
Create taxon/parse name when wizard is closed and not with every key stroke #5605
minor
fix #5604
Resolve merge conflict
Merge branch 'hotfix/3.12.4' into develop
Conflicts: eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmServerInfo.java - resolved eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java - UNRESOLVED!!!!!
fix the merge conflicts of hotfix branch
Fix NPE when adding new taxon to classification
revert the commit, which is already in hotfix branch
fixes
do not provide menu item change synonym to accepted taxon for homotyp. synonym of accepted taxon and fix new taxonNode creation
cherry pick from develop
use new createTaxonNode method instead of do it on the editor side
Allow creating new taxa in taxon selection dialog #2402
Cleanup code
Removed option and preferences for directly opening specimen after creation.
Merge branch 'develop' into unify_derivative_views
Bind null session for new derived unit wizard
Fix typo
Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into actualBranch
improve messaging for deleteResult
Change merge to standard call for new taxon node
Add remoting checks for merge, Move to merge call which returns updated transient object
fixing problem of reusing name for creation of taxon
Add check for remoting to decide whether to merge or save
#5291 Disable data change event firing in case of remoting
Merge branch 'develop' into remoting-4.0
Conflicts: eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewDerivedUnitBaseWizard.java
Fix initialization problems for preferences and editor input
Add preference for opening a newly created specimen in specimen editor
Open a newly created specimen in specimen editor
Conflicts: eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/create/NewSpecimenHandler.java
Trim code
#5234 Add correct updated objects to change event
#5225 Replace saveOrUpdate with merge for new entity wizards
#5134, #5136 (and potentially #5135) Fix incorrect clean up of session manager and Check for class in new taxon wizard
#5007 : Add remoting handler / operations for the taxon navigator
Merge branch 'master' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0
Conflicts: .gitattributes eu.etaxonomy.taxeditor.cdmlib/.classpath eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java...
InspectSessionsDialog : added filtering CdmStore : clearing caches and session before connecting ParseHandler : using NonViralName instead of TaxonNameBase AbstractPostTaxonOperation, AbstractPostOperation, AbstractPersistentPostOperation : added CdmEntitySessionEnabled object to constructor...
NewTaxonNodeWizard : replaced saveOrUpdate with merge for remoting AbstractPersistentPostOperation : added ICdmEntitySessionEnabled to constructor RemotingLoginDialog : added functionality to directly connect to local dev eclipse cdmserver if vm arg is present
merge from trunk
Moved all logging and dialog functionality to the new class MessagingUtils. Refactoring code to adapt to above change. Added new custom error dialog - CdmErrorDialog Added runtime exception handling to the ApplicationWorkbenchAdvisor by adding a custom status handler
reverting cdm application / controller refactoring and simply extending the CdmApplicationRemoteConfiguration class by throwing UnsupportedOperationException for methods that are not supported by remoting
refactoring ICdmApplicationDefaultConfiguration
merge-update from trunk
merge-update of trunk and disabling GUI-Control separation
rename FieldObservation -> FieldUnit #3566
rename NewFieldObservationWizard.java and label #3566
merged model adaptions to cdmlib 3.2.4 from campanula branch
merged/implemented cdm3.3 model adaptations
merged trunk into branch
removed commented code
updated wizard to return new DerivedUnit for given type
updates for 3.3 model changes. Phase two commit, which contains method changes / updates
Aligning Editor with 3.3 model changes. First phase commit which updates only the classes. Branch not compilable at the moment.
completing merge from trunk for latest taxed developments
solved #2990 (implement missing parts of Groups admin details view)
Fixed #2435