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
minor
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
Refactoring of selection elements. Additional minor refactoring. Fixed a bug with Translation Editor (#2752)
refactoring of package names for consistency
Buckminster is dead, long live Tycho. The complete build can now be fully automated with eclipse tycho, Thus we will be able to have continous integration for the editor and automated builds by jenkins and all the glory. Removed all buckminster related files.
Fixes #2368
Fixes #2436; PolytomousKeyListView now allows deletion of multiple elements
Temporary fix for #2366; fixes #2368; Refactoring annotations in the name editor
cdmlib classes that were programmed against CdmApplicationController now accept ICdmApplicationController. Adapted accordingly.
Removing inappropriate method call
Refactoring selection elements so they can be configured
had to rename the packages to make them compliant with buckminster